Merge pull request #179 from emaslak/standard_2.0

Updated bundle to use strict standard 2.0.

.travis.yml

@@ -26,7 +26,7 @@ before_script:
   - composer update --prefer-source
 script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
-  - vendor/bin/phpcs -p --standard=$TRAVIS_BUILD_DIR/vendor/ongr/ongr-strict-standard/ONGR --ignore=vendor/,Tests/app/,Resources/public/,Sync/DiffProvider/DiffProvider.php,Sync/DiffProvider/Item/BaseDiffItem.php ./
+  - vendor/bin/phpcs -p --standard=$TRAVIS_BUILD_DIR/vendor/ongr/ongr-strict-standard/Ongr --ignore=vendor/,Tests/app/,Resources/public/,Sync/DiffProvider/DiffProvider.php,Sync/DiffProvider/Item/BaseDiffItem.php ./
   - sphinx-build -nWq -b html -c . Resources/doc _build/html
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar

Tests/Functional/Command/SyncProvideCommandTest.php

@@ -486,7 +486,6 @@ private function setLastSync($from, $startType)
             // Sometimes, mysql, php and server timezone could differ, we need convert time seen by php
             // to the same time in the same timezone as is used in mysqlbinlog.
             // This issue is for tests only, should not affect live website.
-
             $result = $this->managerMysql->getConnection()->executeQuery('SELECT @@global.time_zone');
             $time_zone = $result->fetchAll()[0]['@@global.time_zone'];
 

Tests/Functional/Fixtures/Bundles/Acme/TestBundle/Document/Item.php

@@ -40,7 +40,7 @@ class Item implements DocumentInterface
 
     /**
      * @var \DateTime
-     * 
+     *
      * @ES\Property(name="created_at", type="date")
      */
     private $createdAt;

Tests/Functional/Sync/Extractor/DoctrineExtractorTest.php

@@ -31,11 +31,9 @@ public function testExtract()
         $extractor = $container->get('ongr_connections.sync.extractor.doctrine_extractor');
 
         // Populate database with schema and data.
-
         $this->importData('ExtractorTest/sample_db.sql');
 
         // Get storage mock.
-
         /** @var SyncStorageInterface|\PHPUnit_Framework_MockObject_MockObject $dummySyncStorage */
         $dummySyncStorage = $this->getMock('\ONGR\ConnectionsBundle\Sync\SyncStorage\SyncStorageInterface');
         $dummySyncStorage
@@ -54,7 +52,6 @@ public function testExtract()
         $extractor->setStorageFacility($dummySyncStorage);
 
         // Execute.
-
         // Should not make any save calls because Category CREATE action is turned off.
         $item = new CreateDiffItem();
         $item->setCategory('oxcategories');

Tests/Unit/EventListener/LoadClassMetadataListenerTest.php

@@ -137,7 +137,6 @@ public function getTestMetadataProcessingData()
         $out[] = [$replacements, $input, $output];
 
         // Case 5: nested annotations.
-
         $inputClassMetadataInfo = new ClassMetadataInfo('someEntity');
         $inputClassMetadataInfo->mapField(
             array_merge(
@@ -167,7 +166,6 @@ public function getTestMetadataProcessingData()
         $out[] = [$replacements, $input, $output];
 
         // Case 6: replacing table name.
-
         $inputClassMetadataInfo = new ClassMetadataInfo('someEntity');
         $inputClassMetadataInfo->mapField($baseMapping);
         $inputClassMetadataInfo->setPrimaryTable(

UrlInvalidator/UrlInvalidatorService.php

@@ -229,7 +229,7 @@ public function createUrlsTempFile()
     /**
      * Invalidates collected URLs.
      *
-     * @return string Executed file name
+     * @return string Executed file name.
      */
     public function invalidate()
     {

composer.json

@@ -19,8 +19,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~4.2",
-        "squizlabs/php_codesniffer": "~1.5",
-        "ongr/ongr-strict-standard": "~1.0.0-beta",
+        "squizlabs/php_codesniffer": "~2.0",
+        "ongr/ongr-strict-standard": "~2.1",
         "doctrine/doctrine-bundle": "~1.2"
     },
     "autoload": {