Merge pull request #122 from ryanadair/master

Update to php 8 and 8.1.
zf-fr · Mar 29, 2022 · fb845b2 · fb845b2
2 parents 17c1fdb + a19c50e
commit fb845b2
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -16,15 +16,16 @@
         }
     ],
     "require": {
-        "php": "~7.0",
+        "php": "^7.0|^8.0|^8.1",
         "guzzlehttp/guzzle-services": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
         "laminas/laminas-diactoros": "^1.3 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
-        "squizlabs/php_codesniffer": "^2.5"
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^2.5",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "suggest": {
         "laminas/laminas-servicemanager": "^3.0"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-    <testsuite name="ZfrShopify tests">
-        <directory>./test</directory>
-    </testsuite>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuite name="ZfrShopify tests">
+    <directory>./test</directory>
+  </testsuite>
 </phpunit>
diff --git a/test/Container/ShopifyClientFactoryTest.php b/test/Container/ShopifyClientFactoryTest.php
@@ -18,16 +18,19 @@
 
 namespace ZfrShopifyTest\Container;
 
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 use ZfrShopify\Exception\RuntimeException;
 use ZfrShopify\Container\ShopifyClientFactory;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michaël Gallego
  */
 class ShopifyClientFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testThrowExceptionIfNoConfig()
     {
         $this->expectException(RuntimeException::class);

diff --git a/test/Container/ShopifyGraphQLClientFactoryTest.php b/test/Container/ShopifyGraphQLClientFactoryTest.php
@@ -22,12 +22,15 @@
 use ZfrShopify\Exception\RuntimeException;
 use ZfrShopify\Container\ShopifyGraphQLClientFactory;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @author Michaël Gallego
  */
 class ShopifyGraphQLClientFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testThrowExceptionIfNoConfig()
     {
         $this->expectException(RuntimeException::class);

diff --git a/test/OAuth/AuthorizationRedirectResponseTest.php b/test/OAuth/AuthorizationRedirectResponseTest.php
@@ -20,12 +20,14 @@
 
 use ZfrShopify\OAuth\AuthorizationRedirectResponse;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @author Michaël Gallego
  */
 class AuthorizationRedirectResponseTest extends TestCase
 {
+    use ProphecyTrait;
     public function shopDomainProvider()
     {
         return [
@@ -44,10 +46,10 @@ public function testCanCreateAuthorizationReponse($shop)
         $location = $response->getHeaderLine('Location');
 
         $this->assertEquals(302, $response->getStatusCode());
-        $this->assertContains('https://mystore.myshopify.com/admin/oauth/authorize', $location);
-        $this->assertContains('client_id=app_123', $location);
-        $this->assertContains('scope=read_content,write_content', $location);
-        $this->assertContains('redirect_uri=https://www.mysite.com', $location);
-        $this->assertContains('state=', $location);
+        $this->assertStringContainsString('https://mystore.myshopify.com/admin/oauth/authorize', $location);
+        $this->assertStringContainsString('client_id=app_123', $location);
+        $this->assertStringContainsString('scope=read_content,write_content', $location);
+        $this->assertStringContainsString('redirect_uri=https://www.mysite.com', $location);
+        $this->assertStringContainsString('state=', $location);
     }
 }
diff --git a/test/OAuth/TokenExchangerTest.php b/test/OAuth/TokenExchangerTest.php
@@ -23,12 +23,15 @@
 use ZfrShopify\Exception\RuntimeException;
 use ZfrShopify\OAuth\TokenExchanger;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @author Michaël Gallego
  */
 class TokenExchangerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function shopDomainProvider()
     {
         return [

diff --git a/test/ShopifyClientTest.php b/test/ShopifyClientTest.php
@@ -31,12 +31,15 @@
 use ZfrShopify\Exception\RuntimeException;
 use ZfrShopify\ShopifyClient;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @author Michaël Gallego
  */
 class ShopifyClientTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function validationData()
     {
         return [

diff --git a/test/Validator/ApplicationProxyRequestValidatorTest.php b/test/Validator/ApplicationProxyRequestValidatorTest.php
@@ -2,12 +2,15 @@
 
 namespace ZfrShopifyTest\Validator;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\ServerRequestInterface;
 use ZfrShopify\Exception\InvalidApplicationProxyRequestException;
 use ZfrShopify\Validator\ApplicationProxyRequestValidator;
 
 class ApplicationProxyRequestValidatorTest extends \PHPUnit\Framework\TestCase
 {
+    use ProphecyTrait;
+
     public function testValidateSignature()
     {
         $sharedSecret = 'hush';

diff --git a/test/Validator/RequestValidatorTest.php b/test/Validator/RequestValidatorTest.php
@@ -18,6 +18,7 @@
 
 namespace ZfrShopifyTest\Validator;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\ServerRequestInterface;
 use ZfrShopify\Exception\InvalidRequestException;
 use ZfrShopify\Validator\RequestValidator;
@@ -27,6 +28,8 @@
  */
 class RequestValidatorTest extends \PHPUnit\Framework\TestCase
 {
+    use ProphecyTrait;
+
     public function shopHmacProvider()
     {
         $key       = 'shop=mystore.myshopify.com&timestamp=123';

diff --git a/test/Validator/WebhookValidatorTest.php b/test/Validator/WebhookValidatorTest.php
@@ -18,6 +18,7 @@
 
 namespace ZfrShopifyTest\Validator;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\ServerRequestInterface;
 use ZfrShopify\Exception\InvalidRequestException;
 use ZfrShopify\Validator\WebhookValidator;
@@ -27,6 +28,8 @@
  */
 class WebhookValidatorTest extends \PHPUnit\Framework\TestCase
 {
+    use ProphecyTrait;
+
     public function testThrowExceptionIfWebhookHeaderIsNotPresent()
     {
         $this->expectException(InvalidRequestException::class);