Merge remote-tracking branch 'origin/master' into hotfix/double-mock

michalbundyra · michalbundyra · commit 515d9e623627 · 2020-12-11T19:50:56.000Z
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -0,0 +1,27 @@
+name: "Check Coding Standards"
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  coding-standards:
+    name: "Check Coding Standards"
+
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Setup PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "7.4"
+          tools: composer:v2, cs2pr
+
+      - name: "Install dependencies"
+        run: "composer install --no-interaction --no-progress --no-suggest"
+
+      - name: "Run phpcs"
+        run: vendor/bin/phpcs -q --report=checkstyle | cs2pr
diff --git a/.github/workflows/phpmd.yml b/.github/workflows/phpmd.yml
@@ -0,0 +1,27 @@
+name: "Check phpmd"
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  coding-standards:
+    name: "Check phpmd"
+
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Setup PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "7.4"
+          tools: composer:v2
+
+      - name: "Install dependencies"
+        run: "composer require phpmd/phpmd --no-interaction --no-progress --no-suggest"
+
+      - name: "Run phpmd"
+        run: vendor/bin/phpmd classes/ text cleancode,codesize,controversial,design,naming,unusedcode
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -0,0 +1,46 @@
+name: "PHPUnit tests"
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  phpunit:
+    name: PHPUnit tests on PHP ${{ matrix.php-version }}
+
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "pcov"
+          php-version: "${{ matrix.php-version }}"
+          ini-values: memory_limit=-1
+          tools: composer:v2
+
+      - name: "Cache dependencies"
+        uses: "actions/cache@v2"
+        with:
+          path: |
+            ~/.composer/cache
+            vendor
+          key: "php-${{ matrix.php-version }}"
+          restore-keys: "php-${{ matrix.php-version }}"
+
+      - name: "Install dependencies"
+        run: "composer install --no-interaction --no-progress --no-suggest"
+
+      - name: "Tests"
+        run: vendor/bin/phpunit
diff --git a/.github/workflows/test-flight.yml b/.github/workflows/test-flight.yml
@@ -0,0 +1,30 @@
+name: "Check test-flight"
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  coding-standards:
+    name: "Check test-flight"
+
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Setup PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "7.4"
+          tools: composer:v2
+          ini-values: "zend.assertions=1"
+
+      - name: "Install dependencies"
+        run: "composer require cundd/test-flight --no-interaction --no-progress --no-suggest"
+
+      - name: "Run test-flight"
+        run: |
+          vendor/bin/test-flight README.md
+          vendor/bin/test-flight classes/
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/.phpunit.result.cache
+/composer.lock
+/vendor/
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -61,5 +61,3 @@ Responsable for this project is Markus Malkusch markus@malkusch.de.
 
 If you like this project and feel generous donate a few Bitcoins here:
 [1335STSwu9hST4vcMRppEPgENMHD2r1REK](bitcoin:1335STSwu9hST4vcMRppEPgENMHD2r1REK)
-
-[![Build Status](https://travis-ci.org/php-mock/php-mock-prophecy.svg?branch=master)](https://travis-ci.org/php-mock/php-mock-prophecy)
diff --git a/classes/FunctionProphecy.php b/classes/FunctionProphecy.php
@@ -17,22 +17,22 @@
  */
 final class FunctionProphecy implements ProphecyInterface
 {
-    
+
     /**
      * @var Prophet The prophet.
      */
     private $prophet;
-    
+
     /**
      * @var string The namespace.
      */
     private $namespace;
-    
+
     /**
      * @var Revelation[] The delegated prophecies.
      */
     private $revelations = [];
-    
+
     /**
      * Sets the prophet.
      *
@@ -44,7 +44,7 @@ public function __construct($namespace, Prophet $prophet)
         $this->prophet   = $prophet;
         $this->namespace = $namespace;
     }
-    
+
     /**
      * Creates a new function prophecy using the specified function name
      * and arguments.
@@ -74,7 +74,7 @@ public function __call($functionName, array $arguments)
 
         return $prophecy->__call(MockDelegateFunctionBuilder::METHOD, $arguments);
     }
-    
+
     /**
      * Reveals the function prophecies.
      *
diff --git a/classes/PHPProphet.php b/classes/PHPProphet.php
@@ -7,6 +7,7 @@
 use Prophecy\Prophet;
 use Prophecy\Prophecy\ProphecyInterface;
 use Prophecy\Exception\Prediction\AggregateException;
+use ReflectionProperty;
 
 /**
  * A Prophet for built-in PHP functions.
@@ -38,7 +39,7 @@ final class PHPProphet
      * @var Prophet The prophet.
      */
     private $prophet;
-    
+
     /**
      * Builds the prophet.
      *
@@ -49,12 +50,12 @@ public function __construct(Prophet $prophet = null)
         if (is_null($prophet)) {
             $prophet = new Prophet();
         }
-        
+
         $revealer = new ReferencePreservingRevealer(self::getProperty($prophet, "revealer"));
         $util     = self::getProperty($prophet, "util");
         $this->prophet = new Prophet($prophet->getDoubler(), $revealer, $util);
     }
-    
+
     /**
      * Creates a new function prophecy for a given namespace.
      *
@@ -66,7 +67,7 @@ public function prophesize($namespace)
     {
         return new FunctionProphecy($namespace, $this->prophet);
     }
-    
+
     /**
      * Checks all predictions defined by prophecies of this Prophet.
      *
@@ -80,7 +81,7 @@ public function checkPredictions()
         Mock::disableAll();
         $this->prophet->checkPredictions();
     }
-    
+
     /**
      * Defines the function prophecy in the given namespace.
      *
@@ -109,7 +110,7 @@ public static function define($namespace, $name)
             ->build()
             ->define();
     }
-    
+
     /**
      * Returns a private property of a prophet.
      *
@@ -120,7 +121,7 @@ public static function define($namespace, $name)
      */
     private static function getProperty(Prophet $prophet, $property)
     {
-        $reflection = new \ReflectionProperty($prophet, $property);
+        $reflection = new ReflectionProperty($prophet, $property);
         $reflection->setAccessible(true);
         return $reflection->getValue($prophet);
     }
diff --git a/classes/ReferencePreservingRevealer.php b/classes/ReferencePreservingRevealer.php
@@ -15,12 +15,12 @@
  */
 final class ReferencePreservingRevealer implements RevealerInterface
 {
-    
+
     /**
      * @var RevealerInterface The subject.
      */
     private $revealer;
-    
+
     /**
      * Sets the subject.
      *
diff --git a/classes/Revelation.php b/classes/Revelation.php
@@ -18,20 +18,23 @@ final class Revelation implements ProphecyInterface
 {
 
     /**
+     * @internal
      * @var string The function namespace.
      */
     public $namespace;
 
     /**
+     * @internal
      * @var string The function name.
      */
     public $functionName;
 
     /**
+     * @internal
      * @var ProphecyInterface The prophecy.
      */
     public $prophecy;
-    
+
     /**
      * Builds the revelation.
      *
@@ -45,7 +48,7 @@ public function __construct($namespace, $functionName, ProphecyInterface $prophe
         $this->functionName = $functionName;
         $this->prophecy     = $prophecy;
     }
-    
+
     /**
      * Reveals the function prophecy.
      *
diff --git a/composer.json b/composer.json
@@ -19,12 +19,13 @@
         }
     },
     "require": {
-        "php": ">=5.6",
-        "php-mock/php-mock-integration": "^1",
-        "phpspec/prophecy": "^1"
+        "php": ">=7.2",
+        "php-mock/php-mock-integration": "^2",
+        "phpspec/prophecy": "^1.12.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4|^5"
+        "phpunit/phpunit": "^8.5.13 || ^9.5",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "archive": {
         "exclude": ["/tests"]
diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ruleset name="Coding Standards">
+    <rule ref="PSR12"/>
+
+    <arg name="colors"/>
+    <arg value="p"/>
+
+    <file>classes</file>
+    <file>tests</file>
+</ruleset>
diff --git a/tests/PHPProphetTest.php b/tests/PHPProphetTest.php
@@ -13,15 +13,15 @@
  * @license http://www.wtfpl.net/txt/copying/ WTFPL
  * @see PHPProphet
  */
-class PHPProphetTest extends AbstractMockTest
+final class PHPProphetTest extends AbstractMockTest
 {
-    
+
     /**
      * @var PHPProphet The SUT.
      */
     private $prophet;
 
-    protected function setup()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/RegressionTest.php b/tests/RegressionTest.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/.phpunit.result.cache`
	`2`	`+/composer.lock`
	`3`	`+/vendor/`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use Prophecy\Prophet;`
`8`	`8`	`use Prophecy\Prophecy\ProphecyInterface;`
`9`	`9`	`use Prophecy\Exception\Prediction\AggregateException;`
	`10`	`+use ReflectionProperty;`
`10`	`11`
`11`	`12`	`/**`
`12`	`13`	`* A Prophet for built-in PHP functions.`
`@@ -38,7 +39,7 @@ final class PHPProphet`
`38`	`39`	`* @var Prophet The prophet.`
`39`	`40`	`*/`
`40`	`41`	`private $prophet;`
`41`		`-`
	`42`	`+`
`42`	`43`	`/**`
`43`	`44`	`* Builds the prophet.`
`44`	`45`	`*`
`@@ -49,12 +50,12 @@ public function __construct(Prophet $prophet = null)`
`49`	`50`	`if (is_null($prophet)) {`
`50`	`51`	`$prophet = new Prophet();`
`51`	`52`	`}`
`52`		`-`
	`53`	`+`
`53`	`54`	`$revealer = new ReferencePreservingRevealer(self::getProperty($prophet, "revealer"));`
`54`	`55`	`$util = self::getProperty($prophet, "util");`
`55`	`56`	`$this->prophet = new Prophet($prophet->getDoubler(), $revealer, $util);`
`56`	`57`	`}`
`57`		`-`
	`58`	`+`
`58`	`59`	`/**`
`59`	`60`	`* Creates a new function prophecy for a given namespace.`
`60`	`61`	`*`
`@@ -66,7 +67,7 @@ public function prophesize($namespace)`
`66`	`67`	`{`
`67`	`68`	`return new FunctionProphecy($namespace, $this->prophet);`
`68`	`69`	`}`
`69`		`-`
	`70`	`+`
`70`	`71`	`/**`
`71`	`72`	`* Checks all predictions defined by prophecies of this Prophet.`
`72`	`73`	`*`
`@@ -80,7 +81,7 @@ public function checkPredictions()`
`80`	`81`	`Mock::disableAll();`
`81`	`82`	`$this->prophet->checkPredictions();`
`82`	`83`	`}`
`83`		`-`
	`84`	`+`
`84`	`85`	`/**`
`85`	`86`	`* Defines the function prophecy in the given namespace.`
`86`	`87`	`*`
`@@ -109,7 +110,7 @@ public static function define($namespace, $name)`
`109`	`110`	`->build()`
`110`	`111`	`->define();`
`111`	`112`	`}`
`112`		`-`
	`113`	`+`
`113`	`114`	`/**`
`114`	`115`	`* Returns a private property of a prophet.`
`115`	`116`	`*`
`@@ -120,7 +121,7 @@ public static function define($namespace, $name)`
`120`	`121`	`*/`
`121`	`122`	`private static function getProperty(Prophet $prophet, $property)`
`122`	`123`	`{`
`123`		`- $reflection = new \ReflectionProperty($prophet, $property);`
	`124`	`+ $reflection = new ReflectionProperty($prophet, $property);`
`124`	`125`	`$reflection->setAccessible(true);`
`125`	`126`	`return $reflection->getValue($prophet);`
`126`	`127`	`}`