Merge branch '1.2' into 2.0

.php_cs

@@ -16,6 +16,8 @@ return PhpCsFixer\Config::create()
         'phpdoc_annotation_without_dot' => false,
         'phpdoc_no_alias_tag' => false,
         'space_after_semicolon' => false,
+        'yoda_style' => false,
+        'no_break_comment' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(

.travis.yml

@@ -27,6 +27,8 @@ before_script:
   - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   # If set update symfony version
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi;
+  # Remove php-cs-fixer as it is currently not needed on Travis
+  - composer remove --dev --no-update friendsofphp/php-cs-fixer
   # Install packages using composer
   - composer install --prefer-dist
   # Detecting timezone issues by testing on random timezone

Tests/Client/YooChooseNotifierTest.php

@@ -8,7 +8,6 @@
 use PHPUnit_Framework_TestCase;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Psr7\Response;
-use eZ\Publish\Core\Repository\Values\Content\Content;
 use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
 use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 use EzSystems\RecommendationBundle\Client\YooChooseNotifier;
@@ -250,14 +249,10 @@ protected function getContentTypeServiceMock($contentTypeId)
      */
     protected function getRepositoryServiceMock($identifier)
     {
-        $repositoryInterfaceServiceMock = $this->getMock('eZ\Publish\API\Repository\Repository');
-        $signalDispatcherServiceMock = $this->getMock('eZ\Publish\Core\SignalSlot\SignalDispatcher');
-
-        $repositoryServiceMock = $this->getMock(
-            'eZ\Publish\Core\SignalSlot\Repository',
-            array('sudo', 'getContentService', 'getContentTypeService'),
-            array($repositoryInterfaceServiceMock, $signalDispatcherServiceMock)
-        );
+        $repositoryServiceMock = $this
+            ->getMockBuilder('\eZ\Publish\Core\SignalSlot\Repository')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $repositoryServiceMock
             ->expects($this->any())

composer.json

@@ -10,20 +10,23 @@
         }
     ],
     "require": {
+        "ezsystems/ezpublish-kernel": "~5.1 || ^6.7",
         "guzzlehttp/guzzle": "~5.0|~6.0",
         "components/handlebars.js": "~3.0.0",
-        "symfony/symfony": "^2.7.7"
+        "symfony/symfony": "^2.7.7 || ^3.3"
     },
     "require-dev": {
-        "ezsystems/ezpublish-kernel": "~6.0.0 | ~5.1",
         "phpunit/phpunit": "~4.7",
-        "friendsofphp/php-cs-fixer": "^2.1"
+        "friendsofphp/php-cs-fixer": "~2.7.1"
     },
     "autoload": {
         "psr-4": {
             "EzSystems\\RecommendationBundle\\": ""
         }
     },
+    "scripts": {
+        "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0.x-dev"