pact-foundation · tienvx · Dec 23, 2022 · Jan 11, 2023 · Jan 11, 2023 · Jan 15, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,6 +27,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
+          coverage: none
 
       - uses: ramsey/composer-install@v2
         with:
@@ -48,6 +49,7 @@ jobs:
         operating-system: [ ubuntu-latest, macos-latest, windows-latest ]
         php: [ '8.0', '8.1', '8.2' ]
         dependencies: [ 'lowest', 'locked' ]
+    timeout-minutes: 5
 
     name: PHP ${{ matrix.php }} on ${{ matrix.operating-system }} with ${{ matrix.dependencies }} dependencies
 
@@ -58,8 +60,9 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          extensions: openssl, sockets, curl, zip
+          extensions: sockets, curl, zip, ffi
           php-version: ${{ matrix.php }}
+          coverage: none
 
       - name: Composer install
         uses: ramsey/composer-install@v2

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -7,7 +7,8 @@
     ->name('*.php');
 
 $config = new PhpCsFixer\Config();
-$config->setRules(['@PSR12' => true,
+$config->setRules([
+        '@PSR12' => true,
         'strict_param' => false,
         'array_syntax' => ['syntax' => 'short'],
     ])

diff --git a/README.md b/README.md
diff --git a/UPGRADE-9.0.md b/UPGRADE-9.0.md
@@ -0,0 +1,65 @@
+UPGRADE FROM 8.x to 9.0
+=======================
+
+* Environment Variables
+  * These environment variables can be removed:
+    * PACT_CORS
+    * PACT_MOCK_SERVER_HEALTH_CHECK_TIMEOUT
+    * PACT_MOCK_SERVER_HEALTH_CHECK_RETRY_SEC
+
+* Verifier
+  * Different pacts sources can be configured via `addXxx` methods
+
+   Example Usage:
+   ```php
+   $config = new VerifierConfig();
+   $config
+       ->setPort(8000)
+       ->setProviderName('someProvider')
+       ->setProviderVersion('1.0.0');
+
+   $url = new Url();
+   $url
+       ->setUrl(new Uri('http://localhost'))
+       ->setProviderName('someProvider')
+       ->setUsername('user')
+       ->setPassword('pass')
+       ->setToken('token');
+
+   $selectors = (new ConsumerVersionSelectors())
+       ->addSelector('{"tag":"foo","latest":true}')
+       ->addSelector('{"tag":"bar","latest":true}');
+
+   $broker = new Broker();
+   $broker
+       ->setUrl(new Uri('http://localhost'))
+       ->setProviderName('someProvider')
+       ->setUsername('user')
+       ->setPassword('pass')
+       ->setToken('token')
+       ->setConsumerVersionSelectors($selectors);
+
+   $verifier = new Verifier($config);
+   $verifier
+      ->addFile('C:\SomePath\consumer-provider.json');
+      ->addDirectory('C:\OtherPath');
+      ->addUrl($url);
+      ->addBroker($broker);
+
+   $verifyResult = $verifier->verify();
+
+   $this->assertTrue($verifyResult);
+   ```
+
+* Consumer
+  * Pact file write mode has been changed from 'overwrite' to 'merge'. Make sure old pact files are removed before running tests.
+
+   ```shell
+   rm /path/to/pacts/*.json
+   ```
+
+  * Pact files now can ONLY be uploaded to Pact Broker by downloading and running Pact CLI manually.
+
+   ```shell
+   pact-broker publish /path/to/pacts/*.json --consumer-app-version 1.0.0 --branch main --broker-base-url https://test.pactflow.io --broker-token SomeToken
+   ```
diff --git a/composer.json b/composer.json
@@ -19,33 +19,20 @@
     ],
     "require": {
         "php": "^8.0",
-        "ext-openssl": "*",
         "ext-json": "*",
         "composer/semver": "^1.4.0|^3.2.0",
-        "amphp/amp": "^2.5.1",
-        "amphp/byte-stream": "^1.8",
-        "amphp/dns": "^1.2.3",
-        "amphp/hpack": "^3.1.0",
-        "amphp/http-server": "^2.1",
-        "amphp/log": "^1.1",
-        "amphp/process": "^1.1.1",
-        "amphp/serialization": "^1.0",
-        "amphp/socket": "^1.1.3",
-        "amphp/sync": "^1.4.0",
-        "amphp/cache": "^1.4.0",
-        "amphp/windows-registry": "v0.3.3",
+        "symfony/process": "^4.4|^5.4|^6.0",
         "guzzlehttp/guzzle": "^6.5.8|^7.4.5",
-        "phpunit/phpunit": ">=8.5.23 <10",
-        "tienvx/composer-downloads-plugin": "^1.1.0"
+        "tienvx/composer-downloads-plugin": "^1.2.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
-        "mockery/mockery": "^1.4.2",
         "slim/slim": "^4.6",
         "slim/psr7": "^1.2.0",
         "friendsofphp/php-cs-fixer": "^3.0",
         "php-amqplib/php-amqplib": "^3.0",
-        "phpstan/phpstan": "^1.9"
+        "phpstan/phpstan": "^1.9",
+        "phpunit/phpunit": ">=8.5.23 <10"
     },
     "autoload": {
         "psr-4": {
@@ -66,27 +53,49 @@
             "MessageProvider\\": [
                 "example/src/MessageProvider",
                 "example/tests/MessageProvider"
+            ],
+            "Provider\\": [
+                "example/src/Provider"
             ]
         }
     },
     "scripts": {
         "start-provider": "php -S localhost:58000 -t example/src/Provider/public/",
-        "static-code-analysis": "phpstan analyse src/ --level=7",
-        "lint": "php-cs-fixer fix --config .php-cs-fixer.php --dry-run",
-        "fix": "php-cs-fixer fix --config .php-cs-fixer.php",
-        "test": "phpunit --debug -c example/phpunit.all.xml"
+        "static-code-analysis": "phpstan",
+        "lint": "php-cs-fixer fix --dry-run",
+        "fix": "php-cs-fixer fix",
+        "test": [
+            "php -r \"array_map('unlink', glob('./example/output/*.json'));\"",
+            "phpunit --debug -c example/phpunit.all.xml"
+        ]
     },
     "extra": {
         "downloads": {
-            "pact-ruby-standalone": {
-                "version": "1.91.0",
+            "pact-ffi-headers": {
+                "version": "0.4.4",
+                "url": "https://github.com/pact-foundation/pact-reference/releases/download/libpact_ffi-v{$version}/pact.h",
+                "path": "bin/pact-ffi-headers/pact.h"
+            },
+            "pact-ffi-lib": {
+                "version": "0.4.4",
+                "variables": {
+                    "{$prefix}": "PHP_OS_FAMILY === 'Windows' ? 'pact_ffi' : 'libpact_ffi'",
+                    "{$os}": "PHP_OS === 'Darwin' ? 'osx' : strtolower(PHP_OS_FAMILY)",
+                    "{$architecture}": "in_array(php_uname('m'), ['arm64', 'aarch64']) ? (PHP_OS === 'Darwin' ? 'aarch64-apple-darwin' : 'aarch64') : 'x86_64'",
+                    "{$extension}": "PHP_OS_FAMILY === 'Windows' ? 'dll' : (PHP_OS === 'Darwin' ? 'dylib' : 'so')"
+                },
+                "url": "https://github.com/pact-foundation/pact-reference/releases/download/libpact_ffi-v{$version}/{$prefix}-{$os}-{$architecture}.{$extension}.gz",
+                "path": "bin/pact-ffi-lib/pact.{$extension}"
+            },
+            "pact-stub-server": {
+                "version": "0.5.3",
                 "variables": {
-                    "{$os}": "PHP_OS_FAMILY === 'Windows' ? 'win32' : (PHP_OS === 'Darwin' ? 'osx' : 'linux')",
-                    "{$architecture}": "PHP_OS === 'Linux' ? '-x86_64' : ''",
-                    "{$extension}": "PHP_OS_FAMILY === 'Windows' ? 'zip' : 'tar.gz'"
+                    "{$os}": "PHP_OS === 'Darwin' ? 'osx' : strtolower(PHP_OS_FAMILY)",
+                    "{$extension}": "PHP_OS_FAMILY === 'Windows' ? '.exe' : ''"
                 },
-                "url": "https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v{$version}/pact-{$version}-{$os}{$architecture}.{$extension}",
-                "path": "bin/pact-ruby-standalone"
+                "url": "https://github.com/pact-foundation/pact-stub-server/releases/download/v{$version}/pact-stub-server-{$os}-x86_64{$extension}.gz",
+                "path": "bin/pact-stub-server/pact-stub-server{$extension}",
+                "executable": true
             }
         }
     },

diff --git a/example/README.md b/example/README.md
@@ -16,10 +16,6 @@ All examples could be run within tests.
 ## Consumer Tests for Message Processing
 
     vendor/bin/phpunit -c example/phpunit.message.consumer.xml
-
-## Provider Verification Tests for Message Processing
-
-    vendor/bin/phpunit -c example/phpunit.message.provider.xml
 
 ## All tests together 
 

diff --git a/example/pacts/someconsumer-someprovider.json b/example/pacts/someconsumer-someprovider.json
@@ -47,7 +47,7 @@
         "matchingRules": {
           "$.body.message": {
             "match": "regex",
-            "regex": "(Hello, )[A-Za-z]"
+            "regex": "(Hello, )[A-Za-z]+"
           }
         }
       },

diff --git a/example/pacts/test_consumer-test_provider.json b/example/pacts/test_consumer-test_provider.json
@@ -47,7 +47,7 @@
   ],
   "metadata": {
     "pactSpecification": {
-      "version": "2.0.0"
+      "version": "3.0.0"
     }
   }
 }
diff --git a/example/phpunit.all.xml b/example/phpunit.all.xml
@@ -13,30 +13,12 @@
         <testsuite name="PhpPact Message Consumer Example Tests">
             <directory>./tests/MessageConsumer</directory>
         </testsuite>
-        <testsuite name="PhpPact Message Provider Example Tests">
-            <directory>./tests/MessageProvider</directory>
-        </testsuite>
     </testsuites>
-    <listeners>
-        <listener class="PhpPact\Consumer\Listener\PactTestListener">
-            <arguments>
-                <array>
-                    <element key="0">
-                        <string>PhpPact Consumer Example Tests</string>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
     <php>
         <env name="PACT_MOCK_SERVER_HOST" value="localhost"/>
         <env name="PACT_MOCK_SERVER_PORT" value="7200"/>
         <env name="PACT_CONSUMER_NAME" value="someConsumer"/>
-        <env name="PACT_CONSUMER_VERSION" value="1.0.0"/>
-        <env name="PACT_CONSUMER_TAG" value="master"/>
         <env name="PACT_PROVIDER_NAME" value="someProvider"/>
         <env name="PACT_OUTPUT_DIR" value=".\example\output\\"/>
-        <env name="PACT_CORS" value="true"/>
-        <env name="PACT_MOCK_SERVER_HEALTH_CHECK_RETRY_SEC" value="2"/>
     </php>
 </phpunit>
diff --git a/example/phpunit.consumer.xml b/example/phpunit.consumer.xml
@@ -5,26 +5,11 @@
             <directory>./tests/Consumer</directory>
         </testsuite>
     </testsuites>
-    <listeners>
-        <listener class="PhpPact\Consumer\Listener\PactTestListener">
-            <arguments>
-                <array>
-                     <element key="0">
-                        <string>PhpPact Example Tests</string>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
     <php>
         <env name="PACT_MOCK_SERVER_HOST" value="localhost"/>
         <env name="PACT_MOCK_SERVER_PORT" value="7200"/>
         <env name="PACT_CONSUMER_NAME" value="someConsumer"/>
-        <env name="PACT_CONSUMER_VERSION" value="1.0.0"/>
-        <env name="PACT_CONSUMER_TAG" value="master"/>
         <env name="PACT_PROVIDER_NAME" value="someProvider"/>
         <env name="PACT_OUTPUT_DIR" value=".\example\output"/>
-        <env name="PACT_MOCK_SERVER_HEALTH_CHECK_TIMEOUT" value="10"/>
-        <!-- <env name="PACT_BROKER_URI" value="http://localhost"/> -->
     </php>
 </phpunit>
diff --git a/example/phpunit.core.xml b/example/phpunit.core.xml
@@ -5,26 +5,11 @@
             <directory>../tests</directory>
         </testsuite>
     </testsuites>
-    <listeners>
-        <listener class="PhpPact\Consumer\Listener\PactTestListener">
-            <arguments>
-                <array>
-                    <element key="0">
-                        <string>PhpPact Consumer Example Tests</string>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
     <php>
         <env name="PACT_MOCK_SERVER_HOST" value="localhost"/>
         <env name="PACT_MOCK_SERVER_PORT" value="7200"/>
         <env name="PACT_CONSUMER_NAME" value="someConsumer"/>
-        <env name="PACT_CONSUMER_VERSION" value="1.0.0"/>
-        <env name="PACT_CONSUMER_TAG" value="master"/>
         <env name="PACT_PROVIDER_NAME" value="someProvider"/>
         <env name="PACT_OUTPUT_DIR" value=".\example\output\\"/>
-        <env name="PACT_CORS" value="true"/>
-        <env name="PACT_MOCK_SERVER_HEALTH_CHECK_RETRY_SEC" value="2"/>
     </php>
 </phpunit>
diff --git a/example/phpunit.message.provider.xml b/example/phpunit.message.provider.xml
diff --git a/example/src/Consumer/publish_json_example.php b/example/src/Consumer/publish_json_example.php
diff --git a/example/src/MessageConsumer/ExampleMessageConsumer.php b/example/src/MessageConsumer/ExampleMessageConsumer.php
@@ -4,15 +4,15 @@
 
 class ExampleMessageConsumer
 {
-    public function ProcessText($message)
+    public function ProcessText(string $message): object
     {
         $obj = \json_decode($message);
         print ' [x] Processed ' . \print_r($obj->contents->text, true) . "\n";
 
         return $obj;
     }
 
-    public function ProcessSong($message)
+    public function ProcessSong(string $message): object
     {
         $obj = \json_decode($message);
         print ' [x] Processed ' . \print_r($obj->contents->song, true) . "\n";