Merge pull request #104 from zf-fr/update-deps

Update dependencies
zf-fr · Feb 17, 2020 · ed76148 · ed76148
2 parents 208da49 + 36e5ee5
commit ed76148
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.1.0
+
+* Upgrade dependencies to use "Laminas" instead of deprecated Zend
+
 # 6.0.0
 
 * If you are using the 2020-01 API or newer for the REST API, it will now uses the link based pagination when the

diff --git a/composer.json b/composer.json
@@ -20,14 +20,14 @@
         "guzzlehttp/guzzle-services": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
-        "zendframework/zend-diactoros": "^1.3 || ^2.0"
+        "laminas/laminas-diactoros": "^1.3 || ^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
         "squizlabs/php_codesniffer": "^2.5"
     },
     "suggest": {
-        "zendframework/zend-servicemanager": "^3.0"
+        "laminas/laminas-servicemanager": "^3.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/OAuth/AuthorizationRedirectResponse.php b/src/OAuth/AuthorizationRedirectResponse.php
@@ -18,7 +18,7 @@
 
 namespace ZfrShopify\OAuth;
 
-use Zend\Diactoros\Response\RedirectResponse;
+use Laminas\Diactoros\Response\RedirectResponse;
 
 /**
  * Create a redirection response to Shopify

diff --git a/test/Container/TokenExchangerFactoryTest.php b/test/Container/TokenExchangerFactoryTest.php
diff --git a/test/Model/ShopDomainTest.php b/test/Model/ShopDomainTest.php
@@ -24,36 +24,27 @@
 
 class ShopDomainTest extends TestCase
 {
-    public function domainProvider()
+    public function invalidDomainProvider()
     {
         return [
             [
-                'domain' => 'test',
-                'valid'  => false
+                'domain' => 'test'
             ],
             [
-                'domain' => 'test@@.myshopify.com',
-                'valid'  => false
+                'domain' => 'test@@.myshopify.com'
             ],
             [
-                'domain' => 'test.myshopify.com/other',
-                'valid'  => false
-            ],
-            [
-                'domain' => 'test.myshopify.com',
-                'valid'  => true
+                'domain' => 'test.myshopify.com/other'
             ]
         ];
     }
 
     /**
-     * @dataProvider domainProvider
+     * @dataProvider invalidDomainProvider
      */
-    public function testShopDomain(string $domain, bool $isValid)
+    public function testShopDomain(string $domain)
     {
-        if (!$isValid) {
-            $this->expectException(InvalidArgumentException::class);
-        }
+        $this->expectException(InvalidArgumentException::class);
 
         new ShopDomain($domain);
     }