Apply Doctrine Coding Standard

.scrutinizer.yml

@@ -9,7 +9,7 @@ tools:
     php_code_sniffer:
         enabled: true
         config:
-            standard: PSR2
+            standard: Doctrine
         filter:
             paths: ["src/*", "tests/*"]
     php_cpd:

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
 
 env:
@@ -18,8 +17,4 @@ script:
   - ./vendor/bin/phpunit --group=Functional
   - php -n ./vendor/bin/phpbench run --report=aggregate --revs=500 --iterations=50 --warmup=3
   # Only run the code standards with the latest package
-  - if [ "$DEPENDENCIES" = "high" ]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/ ./benchmarks; fi;
-
-after_script:
-  - if [[ $TRAVIS_PHP_VERSION = '7.1' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [[ $TRAVIS_PHP_VERSION = '7.1' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
+  - if [ "$DEPENDENCIES" = "high" ]; then ./vendor/bin/phpcs --standard=Doctrine ./src/ ./tests/ ./benchmarks; fi;

benchmarks/GeneratedHydratorBenchmark/AllPrivateClass.php

@@ -1,16 +1,26 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Class that contains only private properties
  */
 class AllPrivateClass
 {
+//phpcs:disable SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedProperty
+    /** @var mixed */
     private $foo;
+    /** @var mixed */
     private $bar;
+    /** @var mixed */
     private $baz;
+    /** @var mixed */
     private $someFooProperty;
+    /** @var mixed */
     private $someBarProperty;
+    /** @var mixed */
     private $someBazProperty;
+//phpcs:enable
 }

benchmarks/GeneratedHydratorBenchmark/AllPrivateClassHydrationBench.php

@@ -1,15 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Benchmark class that contains only private properties hydration
  *
  * @BeforeMethods({"setUp"})
  */
-class AllPrivateClassHydrationBench extends AbstractHydrationBench
+class AllPrivateClassHydrationBench extends HydrationBench
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->createHydrator(AllPrivateClass::class);
         $this->createData();
@@ -20,7 +22,7 @@ public function setUp()
      * @Revs(100)
      * @Iterations(200)
      */
-    public function benchConsume()
+    public function benchConsume() : void
     {
         $this->hydrator->hydrate($this->data, $this->object);
     }

benchmarks/GeneratedHydratorBenchmark/AllProtectedClass.php

@@ -1,16 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Class that contains only protected properties
  */
 class AllProtectedClass
 {
+    /** @var mixed */
     protected $foo;
+    /** @var mixed */
     protected $bar;
+    /** @var mixed */
     protected $baz;
+    /** @var mixed */
     protected $someFooProperty;
+    /** @var mixed */
     protected $someBarProperty;
+    /** @var mixed */
     protected $someBazProperty;
 }

benchmarks/GeneratedHydratorBenchmark/AllProtectedClassHydrationBench.php

@@ -1,15 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Benchmark class that contains only protected properties hydration
  *
  * @BeforeMethods({"setUp"})
  */
-class AllProtectedClassHydrationBench extends AbstractHydrationBench
+class AllProtectedClassHydrationBench extends HydrationBench
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->createHydrator(AllProtectedClass::class);
         $this->createData();
@@ -20,7 +22,7 @@ public function setUp()
      * @Revs(100)
      * @Iterations(200)
      */
-    public function benchConsume()
+    public function benchConsume() : void
     {
         $this->hydrator->hydrate($this->data, $this->object);
     }

benchmarks/GeneratedHydratorBenchmark/AllPublicClass.php

@@ -1,16 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Class that contains only public properties
  */
 class AllPublicClass
 {
+    /** @var mixed */
     public $foo;
+    /** @var mixed */
     public $bar;
+    /** @var mixed */
     public $baz;
+    /** @var mixed */
     public $someFooProperty;
+    /** @var mixed */
     public $someBarProperty;
+    /** @var mixed */
     public $someBazProperty;
 }

benchmarks/GeneratedHydratorBenchmark/AllPublicClassHydrationBench.php

@@ -1,15 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Benchmark class that contains only public properties hydration
  *
  * @BeforeMethods({"setUp"})
  */
-class AllPublicClassHydrationBench extends AbstractHydrationBench
+class AllPublicClassHydrationBench extends HydrationBench
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->createHydrator(AllPublicClass::class);
         $this->createData();
@@ -20,7 +22,7 @@ public function setUp()
      * @Revs(100)
      * @Iterations(200)
      */
-    public function benchConsume()
+    public function benchConsume() : void
     {
         $this->hydrator->hydrate($this->data, $this->object);
     }

benchmarks/GeneratedHydratorBenchmark/AbstractHydrationBench.php → benchmarks/GeneratedHydratorBenchmark/HydrationBench.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 use GeneratedHydrator\Configuration;
@@ -8,29 +10,21 @@
 /**
  * Default base class for hydration benchmarks
  */
-abstract class AbstractHydrationBench
+abstract class HydrationBench
 {
-    /**
-     * @var HydratorInterface
-     */
+    /** @var HydratorInterface */
     protected $hydrator;
 
-    /**
-     * @var mixed[]
-     */
+    /** @var mixed[] */
     protected $data;
 
-    /**
-     * @var mixed
-     */
+    /** @var mixed */
     protected $object;
 
     /**
      * Create and set the hydrator
-     *
-     * @param string $class
      */
-    protected function createHydrator($class)
+    protected function createHydrator(string $class) : void
     {
         $config        = new Configuration($class);
         $hydratorClass = $config->createFactory()->getHydratorClass();
@@ -41,13 +35,13 @@ protected function createHydrator($class)
     /**
      * Populate test data array
      */
-    protected function createData()
+    protected function createData() : void
     {
         $this->data = [
             'foo' => 'some foo string',
             'bar' => 42,
             'baz' => new \DateTime(),
-            'someFooProperty' => array(12, 13, 14),
+            'someFooProperty' => [12, 13, 14],
             'someBarProperty' => 12354.4578,
             'someBazProperty' => new \stdClass(),
         ];

benchmarks/GeneratedHydratorBenchmark/InheritanceClass.php

@@ -1,16 +1,26 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Class that contains mixed inherited properties
  */
 class InheritanceClass extends MixedClass
 {
+//phpcs:disable SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedProperty
+    /** @var mixed */
     private $foo1;
+    /** @var mixed */
     protected $bar1;
+    /** @var mixed */
     public $baz1;
+    /** @var mixed */
     private $someFooProperty1;
+    /** @var mixed */
     protected $someBarProperty1;
+    /** @var mixed */
     public $someBazProperty1;
+//phpcs:enable
 }

benchmarks/GeneratedHydratorBenchmark/InheritanceClassHydrationBench.php

@@ -1,29 +1,31 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Benchmark class that contains mixed inherited properties hydration
  *
  * @BeforeMethods({"setUp"})
  */
-class InheritanceClassHydrationBench extends AbstractHydrationBench
+class InheritanceClassHydrationBench extends HydrationBench
 {
-    protected function createData()
+    protected function createData() : void
     {
         parent::createData();
 
         $this->data += [
             'foo1' => 'some foo string',
             'bar1' => 42,
             'baz1' => new \DateTime(),
-            'someFooProperty1' => array(12, 13, 14),
+            'someFooProperty1' => [12, 13, 14],
             'someBarProperty1' => 12354.4578,
             'someBazProperty1' => new \stdClass(),
         ];
     }
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->createHydrator(InheritanceClass::class);
         $this->createData();
@@ -34,7 +36,7 @@ public function setUp()
      * @Revs(100)
      * @Iterations(200)
      */
-    public function benchConsume()
+    public function benchConsume() : void
     {
         $this->hydrator->hydrate($this->data, $this->object);
     }

benchmarks/GeneratedHydratorBenchmark/InheritanceDeepClass.php

@@ -1,16 +1,26 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneratedHydratorBenchmark;
 
 /**
  * Class that contains mixed deeply inherited properties
  */
 class InheritanceDeepClass extends InheritanceClass
 {
+//phpcs:disable SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedProperty
+    /** @var mixed */
     private $foo2;
+    /** @var mixed */
     protected $bar2;
+    /** @var mixed */
     public $baz2;
+    /** @var mixed */
     private $someFooProperty2;
+    /** @var mixed */
     protected $someBarProperty2;
+    /** @var mixed */
     public $someBazProperty2;
+//phpcs:enable
 }