fix(test): prevent error by upgrading suites

.github/workflows/--test.yml

@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'dependabot[bot]' && steps.cache-coverage.outputs.cache-hit != 'true'
         id: docker
         with:
-          image: ghcr.io/myparcelnl/php-xd:7.2
+          image: ghcr.io/myparcelnl/php-xd:8.2
 
       - name: 'Install composer dependencies'
         if: github.actor != 'dependabot[bot]' && steps.cache-coverage.outputs.cache-hit != 'true'
@@ -53,6 +53,7 @@ jobs:
             --env CI=${CI} \
             --env API_KEY_NL=${{ secrets.API_KEY_NL }} \
             --env API_KEY_BE=${{ secrets.API_KEY_BE }} \
+            --env XDEBUG_MODE=coverage \
             ${{ steps.docker.outputs.image }} \
             vendor/bin/phpunit --coverage-clover coverage.xml
 

composer.json

@@ -29,14 +29,14 @@
     ],
     "scripts": {
         "test": "phpunit",
-        "test:coverage": "vendor/bin/phpunit --coverage-html coverage"
+        "test:coverage": ["@putenv XDEBUG_MODE=coverage","vendor/bin/phpunit --coverage-html coverage"]
     },
     "require": {
         "php": ">=7.1.0"
     },
     "require-dev": {
         "fakerphp/faker": "^v1.16.0",
-        "phpunit/phpunit": "^7.5.20",
+        "phpunit/phpunit": "^11",
         "psr/container": "~1.0.0"
     },
     "autoload": {
@@ -50,4 +50,4 @@
             "MyParcelNL\\Sdk\\Test\\": "test"
         }
     }
-}
+}

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 # volumes are not in common, because phpstorm doesn't understand it
 x-common: &common
-  image: ghcr.io/myparcelnl/php-xd:7.2
+  image: ghcr.io/myparcelnl/php-xd:8.2
   init: true
   env_file:
     - .env

phpunit.xml

@@ -10,11 +10,11 @@
             <directory>test</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <source>
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
     <php>
         <env name="TEST" value="true" />
     </php>

src/Model/Fulfilment/OrderLine.php

@@ -73,6 +73,10 @@ public function __construct(array $data = [])
         $this->product = new Product($data['product'] ?? []);
     }
 
+    public function __toString() {
+        return (string) self::class;
+    }
+
     /**
      * @return array
      */

src/Support/Collection.php

@@ -1732,6 +1732,10 @@ static function ($value) {
                     return Helpers::toArrayWithoutNull($value);
                 }
 
+                if (is_int($value)) {
+                    return $value;
+                }
+
                 if ($value && method_exists($value, 'toArrayWithoutNull')) {
                     return $value->toArrayWithoutNull();
                 }
@@ -1754,7 +1758,7 @@ static function ($value) {
     public function jsonSerialize()
     {
         return array_map(function ($value) {
-            if (method_exists($value, 'toArray')) {
+            if (method_exists((string) $value, 'toArray')) {
                 return $value->toArray();
             }
 

test/Bootstrap/ConsignmentTestCase.php

@@ -116,7 +116,7 @@ protected function addCheckoutData(array $data, AbstractConsignment $consignment
      */
     protected static function assertHasPdfLink(MyParcelCollection $collection): void
     {
-        self::assertRegExp('#^https://api.myparcel.nl/pdfs#', $collection->getLinkOfLabels(), 'Can\'t get link of PDF');
+        self::assertMatchesRegularExpression('#^https://api.myparcel.nl/pdfs#', $collection->getLinkOfLabels(), 'Can\'t get link of PDF');
     }
 
     /**

test/Bootstrap/TestCase.php

@@ -22,13 +22,16 @@ class TestCase extends \PHPUnit\Framework\TestCase
     protected $faker;
 
     /**
-     * @param  string $name
-     * @param  array  $data
-     * @param  string $dataName
+     * @param string|null $name
+     * @param array       $data
+     * @param string      $dataName
      */
-    public function __construct($name = null, array $data = [], $dataName = '')
+    public function __construct(?string $name = null, array $data = [], $dataName = '')
     {
         $this->faker = Factory::create('nl_NL');
+        if (!$name) {
+            $name = self::class;
+        }
         parent::__construct($name, $data, $dataName);
     }
 

test/Factory/Account/CarrierConfigurationFactoryTest.php

@@ -15,7 +15,7 @@ class CarrierConfigurationFactoryTest extends TestCase
      * @return array
      * @throws \Exception
      */
-    public function provideCreateCarrierConfigurationData(): array
+    public static function provideCreateCarrierConfigurationData(): array
     {
         return [
 //            'With identifier only'        => [

test/Factory/DeliveryOptionsAdapterFactoryTest.php

@@ -17,10 +17,11 @@ class DeliveryOptionsAdapterFactoryTest extends TestCase
      * @return array
      * @throws \Exception
      */
-    public function provideCreateData(): array
+    public static function provideCreateData(): array
     {
         $date = (new DateTime())->format('Ymd H:i:s');
-        return $this->createProviderDataset([
+        $instance = new self();
+        return $instance->createProviderDataset([
             'DeliveryOptionsV2Adapter'                  => [
                 'carrier' => CarrierPostNL::NAME,
                 'date'    => $date,
@@ -69,7 +70,7 @@ public function provideCreateData(): array
                     'age_check'         => true,
                     'large_format'      => true,
                     'return'            => true,
-                    'label_description' => $this->faker->words(3, true),
+                    'label_description' => $instance->faker->words(3, true),
                 ],
                 'pickupLocation'  => null,
             ],
@@ -85,7 +86,7 @@ public function provideCreateData(): array
                     'age_check'         => true,
                     'large_format'      => true,
                     'return'            => true,
-                    'label_description' => $this->faker->words(3, true),
+                    'label_description' => $instance->faker->words(3, true),
                 ],
                 'pickupLocation'  => [
                     'country'           => AbstractConsignment::CC_NL,

test/Helper/TrackTraceUrlTest.php

@@ -12,13 +12,13 @@ class TrackTraceUrlTest extends TestCase
     /**
      * @return array
      */
-    public function provideTrackTraceData(): array
+    public static function provideTrackTraceData(): array
     {
         return [
             'dutch destination' => [
                 'barcode'     => '3SMYPA00123456',
-                'postal_code' => '2132JE',
-                'cc'          => 'NL',
+                'postalCode'  => '2132JE',
+                'countryCode' => 'NL',
             ],
         ];
     }

test/Helper/UtilsTest.php

@@ -12,7 +12,7 @@ class UtilsTest extends TestCase
     /**
      * @return array
      */
-    public function provideGetKeysWithoutValueData(): array
+    public static function provideGetKeysWithoutValueData(): array
     {
         return [
             [

test/Model/Consignment/BpostConsignmentTest.php

@@ -14,12 +14,13 @@ class BpostConsignmentTest extends ConsignmentTestCase
      * @return array
      * @throws \Exception
      */
-    public function provideBpostConsignmentsData(): array
+    public static function provideBpostConsignmentsData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        $instance = new self();
+        return $instance->createConsignmentProviderDataset([
             'BE -> BE' => [],
-            'BE -> NL' => $this->getDefaultAddress(),
-            'Bpost pickup + shipment options' => $this->getDefaultAddress(AbstractConsignment::CC_BE) + [
+            'BE -> NL' => $instance->getDefaultAddress(),
+            'Bpost pickup + shipment options' => $instance->getDefaultAddress(AbstractConsignment::CC_BE) + [
                     self::ONLY_RECIPIENT                 => true,
                     self::SIGNATURE                      => true,
                     self::DELIVERY_TYPE                  => AbstractConsignment::DELIVERY_TYPE_PICKUP,

test/Model/Consignment/ConsignmentOtherOptionsTest.php

@@ -13,10 +13,11 @@ class ConsignmentOtherOptionsTest extends ConsignmentTestCase
      * @return array
      * @throws \Exception
      */
-    public function provideAutoDetectPickupData(): array
+    public static function provideAutoDetectPickupData(): array
     {
-        $deliveryDate = $this->generateDeliveryDate();
-        return $this->createConsignmentProviderDataset(
+        $instance = new self();
+        $deliveryDate = $instance->generateDeliveryDate();
+        return $instance->createConsignmentProviderDataset(
             [
                 'Auto detect pickup' => [
                     'checkout_data'                     => sprintf(
@@ -36,10 +37,11 @@ public function provideAutoDetectPickupData(): array
      * @throws \Exception
      * @deprecated
      */
-    public function provideCheckoutDataData(): array
+    public static function provideCheckoutDataData(): array
     {
-        $deliveryDate = $this->generateDeliveryDate();
-        return $this->createConsignmentProviderDataset([
+        $instance = new self();
+        $deliveryDate = $instance->generateDeliveryDate();
+        return $instance->createConsignmentProviderDataset([
             '[DEPRECATED] checkout data' => [
                 'checkout_data'                            => sprintf(
                     '{"date":"%s","time":[{"start":"16:00:00","type":4,"price":{"currency":"EUR","amount":0}}],"location":"Primera Sanders","street":"Polderplein","number":"3","postal_code":"2132BA","city":"Hoofddorp","cc":"NL","start_time":"16:00:00","price":0,"price_comment":"retail","comment":"Dit is een Postkantoor. Post en pakketten die u op werkdagen vóór de lichtingstijd afgeeft, bezorgen we binnen Nederland de volgende dag. Op zaterdag worden alléén pakketten die u afgeeft voor 15:00 uur maandag bezorgd.","phone_number":"","opening_hours":{"monday":["11:00-18:00"],"tuesday":["09:00-18:00"],"wednesday":["09:00-18:00"],"thursday":["09:00-18:00"],"friday":["09:00-21:00"],"saturday":["09:00-18:00"],"sunday":["12:00-17:00"]},"distance":"312","latitude":"52.30329367","longitude":"4.69476214","location_code":"176227","retail_network_id":"PNPNL-01","holiday":[]}',
@@ -61,9 +63,9 @@ public function provideCheckoutDataData(): array
      * @return array
      * @throws \Exception
      */
-    public function provideSaveRecipientAddressData(): array
+    public static function provideSaveRecipientAddressData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        return (new self())->createConsignmentProviderDataset([
             'Save recipient address' => [
                 self::SAVE_RECIPIENT_ADDRESS => true,
             ],

test/Model/Consignment/ConsignmentShipmentOptionsTest.php

@@ -13,9 +13,10 @@ class ConsignmentShipmentOptionsTest extends ConsignmentTestCase
      * @return array
      * @throws \Exception
      */
-    public function provide18PlusCheckData(): array
+    public static function provide18PlusCheckData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        $instance = new self();
+        return $instance->createConsignmentProviderDataset([
             'Normal 18+ check'      => [
                 self::AGE_CHECK      => true,
                 self::ONLY_RECIPIENT => true,
@@ -29,7 +30,7 @@ public function provide18PlusCheckData(): array
             //      self::expected(self::ONLY_RECIPIENT) => true,
             //      self::expected(self::SIGNATURE)      => true,
             //  ],
-            '18+ check EU shipment' => $this->getDefaultAddress(AbstractConsignment::CC_BE) + [
+            '18+ check EU shipment' => $instance->getDefaultAddress(AbstractConsignment::CC_BE) + [
                     self::AGE_CHECK => true,
                     self::EXCEPTION => 'The age check is not possible with an EU shipment or world shipment',
                 ],
@@ -68,9 +69,9 @@ public function provideDeliveryMomentData(): array
      * @return array
      * @throws \Exception
      */
-    public function provideDigitalStampData(): array
+    public static function provideDigitalStampData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        return (new self())->createConsignmentProviderDataset([
             'Digital stamp 80 grams' => [
                 self::LABEL_DESCRIPTION => 112345,
                 self::PACKAGE_TYPE      => AbstractConsignment::PACKAGE_TYPE_DIGITAL_STAMP,
@@ -95,11 +96,12 @@ public function provideDigitalStampData(): array
      * @return array
      * @throws \Exception
      */
-    public function provideLargeFormatData(): array
+    public static function provideLargeFormatData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        $instance = new self();
+        return $instance->createConsignmentProviderDataset([
             'Large format national'   => [
-                self::CUSTOMS_DECLARATION => $this->getDefaultCustomsDeclaration(),
+                self::CUSTOMS_DECLARATION => $instance->getDefaultCustomsDeclaration(),
                 self::LARGE_FORMAT        => true,
             ],
             // todo:
@@ -108,8 +110,8 @@ public function provideLargeFormatData(): array
             //          self::LARGE_FORMAT                 => true,
             //          self::expected(self::LARGE_FORMAT) => false,
             //      ],
-            'Large format to Belgium' => $this->getDefaultAddress(AbstractConsignment::CC_BE) + [
-                    self::CUSTOMS_DECLARATION       => $this->getDefaultCustomsDeclaration(
+            'Large format to Belgium' => $instance->getDefaultAddress(AbstractConsignment::CC_BE) + [
+                    self::CUSTOMS_DECLARATION       => $instance->getDefaultCustomsDeclaration(
                         AbstractConsignment::CC_BE
                     ),
                     self::LARGE_FORMAT                   => true,
@@ -123,12 +125,13 @@ public function provideLargeFormatData(): array
     /**
      * @throws \Exception
      */
-    public function provideShipmentOptionsWithPickupData(): array
+    public static function provideShipmentOptionsWithPickupData(): array
     {
-        return $this->createConsignmentProviderDataset(
+        $instance = new self();
+        return $instance->createConsignmentProviderDataset(
             [
                 'Pickup with shipment options PostNL'     => [
-                    self::DELIVERY_DATE                  => $this->generateDeliveryDate(),
+                    self::DELIVERY_DATE                  => $instance->generateDeliveryDate(),
                     self::ONLY_RECIPIENT                 => true,
                     self::RETURN                         => true,
                     self::SIGNATURE                      => true,
@@ -145,9 +148,9 @@ public function provideShipmentOptionsWithPickupData(): array
      * @return array
      * @throws \Exception
      */
-    public function provideMailboxData(): array
+    public static function provideMailboxData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        return (new self())->createConsignmentProviderDataset([
             'Mailbox shipment'              => [
                 self::PACKAGE_TYPE => AbstractConsignment::PACKAGE_TYPE_MAILBOX,
             ],
@@ -172,9 +175,9 @@ public function provideMailboxData(): array
      * @return array
      * @throws \Exception
      */
-    public function provideInsuranceData(): array
+    public static function provideInsuranceData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        return (new self())->createConsignmentProviderDataset([
             'EUR 250' => [
                 self::INSURANCE                      => 250,
                 self::expected(self::ONLY_RECIPIENT) => true,
@@ -198,11 +201,12 @@ public function testInsurance(array $testData): void
      * @return array
      * @throws \Exception
      */
-    public function providePickupLocationData(): array
+    public static function providePickupLocationData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        $instance = new self();
+        return $instance->createConsignmentProviderDataset([
             'Pickup location' => [
-                self::DELIVERY_DATE        => $this->generateDeliveryDate(),
+                self::DELIVERY_DATE        => $instance->generateDeliveryDate(),
                 self::DELIVERY_TYPE        => AbstractConsignment::DELIVERY_TYPE_PICKUP,
                 self::PICKUP_CITY          => 'Hoofddorp',
                 self::PICKUP_COUNTRY       => AbstractConsignment::CC_NL,
@@ -219,15 +223,16 @@ public function providePickupLocationData(): array
      * @return array
      * @throws \Exception
      */
-    public function provideReferenceIdentifierData(): array
+    public static function provideReferenceIdentifierData(): array
     {
-        return $this->createConsignmentProviderDataset([
+        $instance = new self();
+        return $instance->createConsignmentProviderDataset([
             //            'normal consignment with reference id'        => [
             //                [self::REFERENCE_IDENTIFIER => $this->generateTimestamp() . '_normal_consignment'],
             //            ],
             'two consignments with reference identifiers' => [
-                [self::REFERENCE_IDENTIFIER => $this->generateTimestamp() . '_2_1'],
-                [self::REFERENCE_IDENTIFIER => $this->generateTimestamp() . '_2_2'],
+                [self::REFERENCE_IDENTIFIER => $instance->generateTimestamp() . '_2_1'],
+                [self::REFERENCE_IDENTIFIER => $instance->generateTimestamp() . '_2_2'],
             ],
         ]);
     }