Merge pull request #294 from bigcommerce/phpmnt-69-upgrade-phpunit

Upgrade php & phpunit
bigcommerce · Jan 16, 2024 · e9c6905 · e9c6905
2 parents 68ccc74 + df5703b
commit e9c6905
Show file tree

Hide file tree

Showing 37 changed files with 329 additions and 470 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,18 +4,35 @@ orbs:
   ci: bigcommerce/internal@volatile
   php: bigcommerce/internal-php@volatile
 
-default_matrix: &default_matrix
+define: &php_min "8.1"
+
+jobs_default: &jobs_default
+  e:
+    name: php/php
+    php-version: << matrix.php-version >>
   matrix:
     parameters:
-      php-version: [ "8.0", "8.1", "8.2" ]
+      php-version: [ *php_min, "8.2" ]
+
+jobs:
+  cs-fixer:
+    executor:
+      name: php/php
+      php-version: *php_min
+    steps:
+      - ci/pre-setup
+      - php/composer-install
+      - run: ./vendor/bin/php-cs-fixer fix --diff --dry-run -v
 
 workflows:
   version: 2
   full:
     jobs:
       - php/phpunit-tests:
-          <<: *default_matrix
-          configuration: "phpunit.xml.dist"
+          <<: *jobs_default
+          minimum_coverage: 60
       - php/static-analysis:
-          <<: *default_matrix
+          <<: *jobs_default
           generate_ide_helper: false
+      - cs-fixer
+
diff --git a/.gitignore b/.gitignore
@@ -4,11 +4,9 @@ composer.lock
 script/*
 
 # Testing
-/phpunit.xml
 /build
 /test/reports
 .env
 .idea
 /.php_cs
-/.php_cs.cache
-/.phpunit.result.cache
+/*.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,12 @@
+<?php
+ return (new PhpCsFixer\Config())
+        ->setFinder(
+            PhpCsFixer\Finder::create()
+                ->files()
+                ->in(__DIR__)
+                ->name("*.php")
+                ->ignoreVCSIgnored(true)
+        )
+        ->setRules([
+            '@PSR2' => true,
+        ]);
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/composer.json b/composer.json
@@ -18,15 +18,16 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "firebase/php-jwt": "~5.0 || ~6.0",
         "ext-curl": "*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.13",
         "php-coveralls/php-coveralls": "2.5",
-        "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.10"
+        "phpunit/phpunit": "^10.0",
+        "phpstan/phpstan": "^1.10",
+        "rector/rector": "^0.19.0"
     },
     "autoload": {
         "psr-0": {

diff --git a/phpunit.xml.dist → phpunit.xml b/phpunit.xml.dist → phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="true" backupStaticAttributes="true" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" forceCoversAnnotation="false" processIsolation="false" bootstrap="vendor/autoload.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="true" colors="true" bootstrap="vendor/autoload.php" cacheDirectory=".phpunit.cache" backupStaticProperties="true" requireCoverageMetadata="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="test/reports/coverage/"/>
@@ -19,4 +16,9 @@
       <directory>test/</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/rector.php b/rector.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([__DIR__ . '/test']);
+    $rectorConfig->sets([
+        PHPUnitSetList::PHPUNIT_100
+    ]);
+};
diff --git a/src/Bigcommerce/Api/Connection.php b/src/Bigcommerce/Api/Connection.php
@@ -609,6 +609,8 @@ public function getHeaders()
      */
     public function __destruct()
     {
-        curl_close($this->curl);
+        if ($this->curl !== null) {
+            curl_close($this->curl);
+        }
     }
 }