WIP: omnipay-square v3 release

.travis.yml

@@ -1,11 +1,26 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
+  - 8.1
+  - 8.2
 
-before_script:
-  - composer install -n --dev --prefer-source
+dist: focal
+
+addons:
+  apt:
+    packages:
+      - libonig5
+
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false
+
+# Cache composer
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+install:
+  - travis_retry composer install --prefer-dist --no-interaction
 
 script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text

README.md

@@ -2,14 +2,15 @@
 
 **Square driver for the Omnipay PHP payment processing library**
 
-[![Build Status](https://travis-ci.org/Transportersio/omnipay-square.png?branch=master)](https://travis-ci.org/Transportersio/omnipay-square)
-[![Latest Stable Version](https://poser.pugx.org/transportersio/omnipay-square/version.png)](https://packagist.org/packages/transportersio/omnipay-square)
-[![Total Downloads](https://poser.pugx.org/transportersio/omnipay-square/d/total.png)](https://packagist.org/packages/transportersio/omnipay-square)
-[![License](https://poser.pugx.org/transportersio/omnipay-square/license)](https://packagist.org/packages/transportersio/omnipay-square)
+[![Build Status](https://app.travis-ci.com/Alofoxx/omnipay-square.svg?branch=master)](https://app.travis-ci.com/Alofoxx/omnipay-square)
+[![Latest Stable Version](https://poser.pugx.org/alofoxx/omnipay-square/version.png)](https://packagist.org/packages/alofoxx/omnipay-square)
+[![Total Downloads](https://poser.pugx.org/alofoxx/omnipay-square/d/total.png)](https://packagist.org/packages/alofoxx/omnipay-square)
+[![License](https://poser.pugx.org/alofoxx/omnipay-square/license)](https://packagist.org/packages/alofoxx/omnipay-square)
 
 [Omnipay](https://github.com/thephpleague/omnipay) is a framework agnostic, multi-gateway payment
-processing library for PHP 5.3+. This package implements Square support for Omnipay.
+processing library for PHP 7.2+. This package implements Square support for Omnipay.
 
+_Note that this package is only tested with PHP 8.0 and above._
 ## Installation
 
 Omnipay is installed via [Composer](http://getcomposer.org/). To install, simply add it
@@ -18,13 +19,11 @@ to your `composer.json` file:
 ```json
 {
     "require": {
-        "transportersio/omnipay-square": "~2.1"
+        "alofoxx/omnipay-square": "~3.0"
     }
 }
 ```
 
-For omnipay v2 use tag 1.0.5 instead.
-
 And run composer to update your dependencies:
 
     $ curl -s http://getcomposer.org/installer | php
@@ -49,5 +48,13 @@ If you want to keep up to date with release anouncements, discuss ideas for the
 or ask more detailed questions, there is also a [mailing list](https://groups.google.com/forum/#!forum/omnipay) which
 you can subscribe to.
 
-If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/Transportersio/omnipay-square/issues),
+If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/alofoxx/omnipay-square/issues),
 or better yet, fork the library and submit a pull request.
+
+## Older Versions
+This package is a fork of the original [omnipay-square](https://github.com/transportersio/omnipay-square) package. 
+The original package is no longer maintained and this repo has merged in the [community made](https://github.com/alofoxx/omnipay-square/graphs/contributors) PRs and updates. 
+This package is a continuation of the original package with the following changes:
+- Updated to work with the latest version of Omnipay
+- Updated to work with the latest version of Square
+- Updated to work with the latest version of PHP

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "blasttech/omnipay-square",
+    "name": "alofoxx/omnipay-square",
     "type": "library",
     "description": "Square driver for the Omnipay payment processing library",
     "keywords": [
@@ -10,31 +10,41 @@
         "payment",
         "square"
     ],
-    "homepage": "https://github.com/transportersio/omnipay-square",
+    "homepage": "https://github.com/alofoxx/omnipay-square",
     "license": "MIT",
     "authors": [
         {
-            "name": "Siriphan Boonmee",
-            "email": "[email protected]"
+            "name": "Alofoxx",
+            "email": "[email protected]"
         },
         {
             "name": "Omnipay Contributors",
-            "homepage": "https://github.com/transportersio/omnipay-square/contributors"
+            "homepage": "https://github.com/alofoxx/omnipay-square/graphs/contributors"
         }
     ],
     "autoload": {
         "psr-4": { "Omnipay\\Square\\" : "src/" }
     },
     "require": {
         "omnipay/common": "~3.0",
-        "square/connect": "*"
+        "square/square": "*"
     },
     "require-dev": {
-        "omnipay/tests": "~3.0"
+        "omnipay/tests": "4.1.2",
+        "symfony/http-client": "^6.2",
+        "php-http/message-factory": "^1.1",
+        "http-interop/http-factory-guzzle": "^1.2",
+        "vlucas/phpdotenv": "^5.6",
+        "squizlabs/php_codesniffer": "*"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
         }
     }
 }

phpunit.xml.dist

@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
-    <testsuites>
-        <testsuite name="Omnipay Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <listeners>
-        <listener class="Mockery\Adapter\Phpunit\TestListener" file="vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php" />
-    </listeners>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Omnipay Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <listeners>
+    <listener class="Mockery\Adapter\Phpunit\TestListener" file="vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php"/>
+  </listeners>
 </phpunit>

src/.env.testing

@@ -0,0 +1,3 @@
+SQUARE_APP_ID=sandbox-xxxxxx-xxxx-xxxxxxxxxxxxxxxxx
+SQUARE_ACCESS_TOKEN=xxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+SQUARE_LOCATION_ID=xxxxxxxxxxxxx

src/Gateway.php

@@ -111,12 +111,12 @@ public function setIdempotencyKey($value)
 
     public function purchase(array $parameters = [])
     {
-        return $this->createRequest('\Omnipay\Square\Message\ChargeRequest', $parameters);
+        return $this->createRequest('\Omnipay\Square\Message\CreatePaymentRequest', $parameters);
     }
 
     public function completePurchase(array $parameters = [])
     {
-        return $this->createRequest('\Omnipay\Square\Message\TransactionRequest', $parameters);
+        return $this->createRequest('\Omnipay\Square\Message\CompletePaymentRequest', $parameters);
     }
 
     /**

src/Message/CardResponse.php

@@ -4,6 +4,7 @@
 
 use Omnipay\Common\Message\AbstractResponse;
 use Omnipay\Common\Message\RedirectResponseInterface;
+use Square\Models\Card;
 
 /**
  * Square Purchase Response
@@ -26,23 +27,21 @@ public function getErrorCode()
         return $this->data['code'];
     }
 
-    public function getCard()
+    public function getCard(): ?Card
     {
-        if(isset($this->data['card'])){
-            if(!empty($this->data['card'])){
-                return $this->data['card'];
-            }
+        if (!empty($this->data['card'])) {
+            return $this->data['card'];
         }
+
         return null;
     }
 
-    public function getCardReference()
+    public function getCardReference(): ?string
     {
-        if(isset($this->data['card'])){
-            if(!empty($this->data['card'])){
-                return $this->data['card']['id'];
-            }
+        if (!empty($this->data['card'])) {
+            return $this->data['card']->getId();
         }
+
         return null;
     }
 }