CI: omnipay doesn't have a master branch any more (#800)

* CI: omnipay doesn't have a master branch any more See #795 * use version of silverstripe-omnipay for SS4 and PHP7.4+ * fix failing tests * fix linting errors
silvershop · Oct 27, 2023 · 9b3d529 · 9b3d529
1 parent bf5bf26
commit 9b3d529
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,5 +12,5 @@ jobs:
     with:
       composer_require_extra:
         phpunit/phpunit:^9.5
-        silverstripe/silverstripe-omnipay:dev-master
+        silverstripe/silverstripe-omnipay:3.x-dev
         php-http/discovery:^1.18.1
diff --git a/src/Checkout/Component/AddressBook.php b/src/Checkout/Component/AddressBook.php
@@ -74,10 +74,10 @@ public function getExistingAddressFields()
             $addressoptions = $member->AddressBook()->sort('Created', 'DESC')->map('ID', 'toString')->toArray();
 
             $translatedAddressType = $this->addresstype;
-            if ($this->addresstype === 'Billing'){
+            if ($this->addresstype === 'Billing') {
                 $translatedAddressType = _t('SilverShop\Model\Address.BillingAddress', $this->addresstype);
             }
-            if ($this->addresstype === 'Shipping'){
+            if ($this->addresstype === 'Shipping') {
                 $translatedAddressType =  _t('SilverShop\Model\Address.ShippingAddress', $this->addresstype);
             }
 

diff --git a/src/Checkout/OrderEmailNotifier.php b/src/Checkout/OrderEmailNotifier.php
@@ -109,7 +109,7 @@ protected function buildEmail($template, $subject)
      *
      * @return bool|string
      */
-    public function sendEmail(string $template, string $subject, bool $copyToAdmin = true)
+    public function sendEmail(string $template, string $subject, ?bool $copyToAdmin = true)
     {
         SSViewer::set_themes(Config::inst()->get(SSViewer::class, 'themes'));