Update command for PHP 7.0

srmklive · Sep 30, 2023 · 7e7edd5 · 7e7edd5
1 parent f264c88
commit 7e7edd5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Install Composer dependencies
       env:
         PHP_VERSION: ${{ matrix.php-versions }}
-      run: $(if [ "$PHP_VERSION" == "7.0" ]; then echo "composer config --no-plugins allow-plugins.kylekatarnls/update-helper &&"; fi;) composer install --no-progress --prefer-dist --optimize-autoloader
+      run: $(if [ "$PHP_VERSION" == "7.0" ]; then echo "composer config --no-plugins allow-plugins.kylekatarnls/update-helper | composer install"; else echo "composer install --no-progress --prefer-dist --optimize-autoloader"; fi;)
     - name: Run tests with code coverage
       env:
         PHP_VERSION: ${{ matrix.php-versions }}

diff --git a/src/Traits/PayPalAPI/Orders.php b/src/Traits/PayPalAPI/Orders.php
@@ -93,7 +93,6 @@ public function confirmOrder(string $order_id, array $data)
     }
 
     /**
->>>>>>> v3.0
      * Authorizes payment for an order.
      *
      * @param string $order_id
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,6 @@ public function confirmOrder(string $order_id, array $data) @@
         }
         /**
-    >>>>>>> v3.0
          * Authorizes payment for an order.
          *
          * @param string $order_id
@@ Expand Down @@