Upgrade to Phony 4.x

Author: ezzatron

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next release
 
+This release uses *Phony* `4.x`. There no BC breaking API changes aside from
+stricter type declarations.
+
 - **[BC BREAK]** PHP 7.1 is no longer supported.
 
 ## 2.0.0 (2017-09-29)

composer.json

@@ -13,19 +13,19 @@
     ],
     "require": {
         "php": ">=7.2",
-        "eloquent/phony": "^3",
+        "eloquent/phony": "^4",
         "peridot-php/peridot": "^1"
     },
     "require-dev": {
         "ext-pdo": "*",
         "eloquent/code-style": "^1",
-        "eloquent/phpstan-phony": "^0.6",
+        "eloquent/phpstan-phony": "^0.7",
         "errors/exceptions": "^0.2",
         "friendsofphp/php-cs-fixer": "^2",
         "peridot-php/leo": "^1",
         "peridot-php/peridot-code-coverage-reporters": "^3",
         "phpstan/extension-installer": "^1",
-        "phpstan/phpstan": "^0.11"
+        "phpstan/phpstan": "^0.12"
     },
     "autoload": {
         "psr-4": {

src/PeridotPhony.php

@@ -19,7 +19,7 @@ class PeridotPhony
      *
      * @return self The newly created plugin.
      */
-    public static function install(EventEmitterInterface $emitter)
+    public static function install(EventEmitterInterface $emitter): self
     {
         $instance = new self();
         $instance->attach($emitter);
@@ -40,7 +40,7 @@ public static function create(): self
     /**
      * Attach the plugin.
      */
-    public function attach(EventEmitterInterface $emitter)
+    public function attach(EventEmitterInterface $emitter): void
     {
         $emitter->on('suite.define', [$this, 'onSuiteDefine']);
         $emitter->on('suite.start', [$this, 'onSuiteStart']);
@@ -49,7 +49,7 @@ public function attach(EventEmitterInterface $emitter)
     /**
      * Detach the plugin.
      */
-    public function detach(EventEmitterInterface $emitter)
+    public function detach(EventEmitterInterface $emitter): void
     {
         $emitter->removeListener('suite.define', [$this, 'onSuiteDefine']);
         $emitter->removeListener('suite.start', [$this, 'onSuiteStart']);
@@ -60,7 +60,7 @@ public function detach(EventEmitterInterface $emitter)
      *
      * @access private
      */
-    public function onSuiteDefine(Suite $suite)
+    public function onSuiteDefine(Suite $suite): void
     {
         $definition = new ReflectionFunction($suite->getDefinition());
         $parameters = $definition->getParameters();
@@ -77,7 +77,7 @@ public function onSuiteDefine(Suite $suite)
      *
      * @access private
      */
-    public function onSuiteStart(Suite $suite)
+    public function onSuiteStart(Suite $suite): void
     {
         foreach ($suite->getTests() as $test) {
             $definition = new ReflectionFunction($test->getDefinition());
@@ -95,7 +95,12 @@ private function __construct()
     {
     }
 
-    private function parameterArguments(array $parameters)
+    /**
+     * @param array<mixed> $parameters
+     *
+     * @return array<mixed>
+     */
+    private function parameterArguments(array $parameters): array
     {
         $arguments = [];
 

test/src/Test/TestClassA.php

@@ -6,63 +6,66 @@
 
 class TestClassA
 {
-    public static function testClassAStaticMethodA()
+    public static function testClassAStaticMethodA(): string
     {
         return implode(func_get_args());
     }
 
-    public static function testClassAStaticMethodB($first, $second)
+    public static function testClassAStaticMethodB(string $first, string $second): string
     {
         return implode(func_get_args());
     }
 
-    public function __construct(&$first = null, &$second = null)
+    public function __construct(string &$first = null, string &$second = null)
     {
         $this->constructorArguments = func_get_args();
 
         $first = 'first';
         $second = 'second';
     }
 
-    public function testClassAMethodA()
+    public function testClassAMethodA(): string
     {
         return implode(func_get_args());
     }
 
-    public function testClassAMethodB($first, $second)
+    public function testClassAMethodB(string $first, string $second): string
     {
         return implode(func_get_args());
     }
 
-    protected static function testClassAStaticMethodC()
+    protected static function testClassAStaticMethodC(): string
     {
         return 'protected ' . implode(func_get_args());
     }
 
-    protected static function testClassAStaticMethodD($first, $second)
+    protected static function testClassAStaticMethodD(string $first, string $second): string
     {
         return 'protected ' . implode(func_get_args());
     }
 
-    protected function testClassAMethodC()
+    protected function testClassAMethodC(): string
     {
         return 'protected ' . implode(func_get_args());
     }
 
-    protected function testClassAMethodD(&$first, &$second)
+    protected function testClassAMethodD(string &$first, string &$second): string
     {
         return 'protected ' . implode(func_get_args());
     }
 
-    private static function testClassAStaticMethodE()
+    private static function testClassAStaticMethodE(): string
     {
         return 'private ' . implode(func_get_args());
     }
 
-    private function testClassAMethodE()
+    private function testClassAMethodE(): string
     {
         return 'private ' . implode(func_get_args());
     }
 
+    /**
+     * @var array<string>|null
+     */
     public $constructorArguments;
 }