Merge pull request #58 from courtney-miles/update-php-81

Update compatibility for PHP 8.1

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['7.2', '7.3', '7.4', '8.0']
+                php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
                 symfony-pkg-version: ['^4.0', '^5.0', '^6.0']
                 composer-flag:
                     - '--prefer-dist'
@@ -21,6 +21,8 @@ jobs:
                       symfony-pkg-version: '^6.0'
                     - php-version: '7.4'
                       symfony-pkg-version: '^6.0'
+                    - php-version: '8.1'
+                      composer-flag: '--prefer-stable --prefer-lowest'
         services:
             mysql:
                 image: mysql:5.7
@@ -53,19 +55,19 @@ jobs:
               with:
                   path: vendor
                   key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                  restore-keys: |
+                  restore-keys: |1
                       ${{ runner.os }}-php-
             - name: Install Composer dependencies
               run: composer update ${{ matrix.composer-flag }} -W --with symfony/validator:"${{ matrix.symfony-pkg-version }}" --with symfony/event-dispatcher:"${{ matrix.symfony-pkg-version }}" --no-interaction --no-progress
 
             # This may be necessary for older dev packages that do not have
             #   upper PHP compatibility version constraints.
             - name: Update Composer Dev dependencies
-              run: composer update mockery/mockery --prefer-dist --no-interaction --no-progress
+              run: composer update phpunit/phpunit mockery/mockery --prefer-dist --no-interaction --no-progress
 
             - name: Run Code Style Check for PHP ${{ matrix.php-version }}
               run: composer run-script style-check
-              if: matrix.php-version != '7.1'
+              if: matrix.php-version == '8.0'
 
             - name: Run tests for PHP ${{ matrix.php-version }}
               run: composer run-script test
@@ -77,4 +79,4 @@ jobs:
               run: vendor/bin/php-coveralls
               env:
                   COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              if: success() && matrix.php-version == '7.4' && matrix.composer-flag == '--prefer-dist'
+              if: success() && matrix.php-version == '8.0' && matrix.composer-flag == '--prefer-dist'

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.1-cli
 
 # system dependecies
 RUN apt-get update && apt-get install -y \
@@ -19,4 +19,4 @@ RUN curl -sS https://getcomposer.org/installer | php \
 	  && apt-get install git unzip -y
 ENV COMPOSER_ALLOW_SUPERUSER=1
 ENV XDEBUG_MODE=coverage
-WORKDIR /src
+WORKDIR /src

PHPUnit/MySQLTestHelper.php

@@ -98,6 +98,7 @@ private function connect(string $dsn): \PDO
     {
         $pdo = new \PDO($dsn, $this->getDatabaseUser(), $this->getDatabasePassword());
         $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+        $pdo->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, true);
 
         return $pdo;
     }

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "7.2 - 8.0",
+        "php": "7.2 - 8.1",
         "ext-PDO": "*",
         "ext-pdo_mysql": "*",
         "symfony/validator": ">=4.0 <6.2",

phpunit.xml.dist

@@ -25,4 +25,4 @@
             <directory suffix=".php">./src/</directory>
         </include>
     </coverage>
-</phpunit>
+</phpunit>

src/Extract/CsvFileExtractor/CsvMultiFileExtractor.php

@@ -82,7 +82,7 @@ public function setHeaders(array $headers): void
         }
     }
 
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         $iterator = new \AppendIterator();
 

src/Extract/CsvFileExtractor/EnforcePrimaryKeyIterator.php

@@ -21,6 +21,7 @@ public function __construct(\Traversable $iterator, array $primaryKeyFields)
     /**
      * @throws DuplicatePrimaryKeyValueException
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $currentRecord = parent::current();

src/Extract/CsvFileExtractor/EnforceUniqueFieldIterator.php

@@ -20,6 +20,7 @@ public function __construct(\Traversable $iterator, array $uniqueFields)
         $this->uniqueFieldValues = array_fill_keys($uniqueFields, []);
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $currentRecord = parent::current();

src/Extract/CsvFileExtractor/MapIterator.php

@@ -26,6 +26,7 @@ public function __construct(\Traversable $iterator, array $headers)
         $this->headers = $headers;
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $record = parent::current();

src/Extract/DatabaseExtractor/DatabaseExtractor.php

@@ -39,7 +39,7 @@ public function __construct(\PDO $pdo, string $queryStr, array $queryParams = []
         $this->queryParams = $queryParams;
     }
 
-    public function getIterator(): iterable
+    public function getIterator(): \Traversable
     {
         $this->queryStmt->execute($this->queryParams);
 

src/Load/DatabaseLoader/SimpleDeleteStmt.php

@@ -46,9 +46,6 @@ public function __construct(\PDO $pdo, string $table, array $conditions = [], st
         $this->database = $database;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(): int
     {
         $conditionsStr = null;

src/SlurpBuilder.php

@@ -131,7 +131,7 @@ public function __construct(
         $this->factory = $slurpFactory;
     }
 
-    public static function create(?ConstraintValidatorFactoryInterface $constraintValidatorFactory = null): self
+    public static function create(ConstraintValidatorFactoryInterface $constraintValidatorFactory = null): self
     {
         return new static(
             new PipelineBuilder(),

src/SlurpFactory.php

@@ -48,7 +48,7 @@ class SlurpFactory
      */
     private $constraintValidatorFactory;
 
-    public function __construct(?ConstraintValidatorFactoryInterface $constraintValidatorFactory = null)
+    public function __construct(ConstraintValidatorFactoryInterface $constraintValidatorFactory = null)
     {
         $this->constraintValidatorFactory = $constraintValidatorFactory;
     }

src/SlurpPayload.php

@@ -127,7 +127,7 @@ public function addViolation(ViolationInterface $violation): void
         $this->violations[] = $violation;
     }
 
-    public function hasViolations(?string $classType = null): bool
+    public function hasViolations(string $classType = null): bool
     {
         if (empty($this->violations)) {
             return false;

src/Transform/SchemaTransformer/SchemaTransformer.php

@@ -37,10 +37,6 @@ public function __construct(Schema $tableSchema)
     }
 
     /**
-     * @param mixed $value
-     *
-     * @return mixed
-     *
      * @throws TransformationException
      */
     public function transformField(string $field, $value)
@@ -97,9 +93,6 @@ public function transformRecord(array $record): array
         return $record;
     }
 
-    /**
-     * @param mixed $name
-     */
     protected function getField($name): ?BaseField
     {
         try {

src/Validate/ConstraintValidation/ConstraintValidator.php

@@ -45,9 +45,6 @@ public function setFieldConstraints(string $field, $constraints): void
         $this->fieldConstraints[$field] = $constraints;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function validateField(int $recordId, string $field, $value): array
     {
         $violations = [];
@@ -64,9 +61,6 @@ public function validateField(int $recordId, string $field, $value): array
         return $violations;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function validateRecord(int $recordId, array $record): array
     {
         $violations = [];

src/Validate/FieldViolation.php

@@ -25,9 +25,6 @@ class FieldViolation implements ViolationInterface
      */
     private $field;
 
-    /**
-     * @var mixed
-     */
     private $value;
 
     /**

src/Validate/SchemaValidation/SchemaValidator.php

@@ -49,9 +49,6 @@ public function __construct(Schema $tableSchema)
         $this->tableSchema = $tableSchema;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function validateField(int $recordId, string $field, $value): array
     {
         $violations = [];
@@ -74,9 +71,6 @@ public function validateField(int $recordId, string $field, $value): array
         return $violations;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function validateRecord(int $recordId, array $record): array
     {
         $violations = [];

src/Validate/ValidatorInterface.php

@@ -16,8 +16,6 @@
 interface ValidatorInterface
 {
     /**
-     * @param mixed $value
-     *
      * @return ViolationInterface[]
      */
     public function validateField(int $recordId, string $field, $value): array;

tests/Slurp/Extract/CsvFileExtractor/VerifyValueCountIteratorTest.php

@@ -21,7 +21,7 @@
 class VerifyValueCountIteratorTest extends TestCase
 {
     /**
-     * @dataProvider getValueCountMismatchTestData
+     * @dataProvider provideValueCountMismatchTestData
      *
      * @throws ValueCountMismatchException
      */
@@ -45,7 +45,7 @@ public function testValueCountMismatch(array $values, int $expectedCount): void
         $iterator->current();
     }
 
-    public function getValueCountMismatchTestData(): array
+    public static function provideValueCountMismatchTestData(): array
     {
         return [
             [[123, 234], 1],

tests/Slurp/Load/DatabaseLoader/StagedLoadTest.php

@@ -36,7 +36,7 @@ public function setUp(): void
     }
 
     /**
-     * @dataProvider getTableRefsForBeginCommitTest
+     * @dataProvider provideTableRefsForBeginCommitTest
      *
      * @throws LogicException
      */
@@ -89,7 +89,7 @@ static function ($sql) use (&$capturedSql) {
         );
     }
 
-    public function getTableRefsForBeginCommitTest(): array
+    public static function provideTableRefsForBeginCommitTest(): array
     {
         return [
             ['my_tbl', null, '`my_tbl`', '`_my_tbl_stage`'],

tests/Slurp/OuterPipeline/ExtractionStageTest.php

@@ -203,6 +203,7 @@ public function __construct(array $rows, int $exceptionAtCount, string $exceptio
                 parent::__construct(new \ArrayObject($rows));
             }
 
+            #[\ReturnTypeWillChange]
             public function current()
             {
                 if ($this->key() !== $this->exceptionAtCount) {

tests/Slurp/Transform/Exception/UnexpectedTypeExceptionTest.php

@@ -19,7 +19,7 @@
 class UnexpectedTypeExceptionTest extends TestCase
 {
     /**
-     * @dataProvider getConstructorArgs
+     * @dataProvider provideConstructorArgs
      */
     public function testConstructMessage($value, $expectedType, $expectedMessage): void
     {
@@ -28,7 +28,7 @@ public function testConstructMessage($value, $expectedType, $expectedMessage): v
         $this->assertSame($expectedMessage, $e->getMessage());
     }
 
-    public function getConstructorArgs(): array
+    public static function provideConstructorArgs(): array
     {
         return [
             ['foo', \stdClass::class, 'Expected argument of type "stdClass", "string" given'],

tests/Slurp/Transform/SchemaTransformer/SchemaTransformerTest.php

@@ -1,15 +1,5 @@
 <?php
 
-/**
- * @author Courtney Miles
- *
- * @see https://github.com/courtney-miles/slurp
- *
- * @package milesasylum/slurp
- *
- * @license MIT
- */
-
 declare(strict_types=1);
 
 namespace MilesAsylum\Slurp\Tests\Slurp\Transform\SchemaTransformer;
@@ -65,10 +55,7 @@ public function testTransformRecord(): void
     }
 
     /**
-     * @dataProvider getComplexTypeConversionTestData
-     *
-     * @param mixed $complexValue
-     * @param mixed $scalarValue
+     * @dataProvider provideComplexTypeConversionTestData
      *
      * @throws TransformationException
      */
@@ -89,7 +76,7 @@ public function testConvertComplexTypeBackToScalar(string $fieldClass, $complexV
         );
     }
 
-    public function getComplexTypeConversionTestData(): array
+    public static function provideComplexTypeConversionTestData(): array
     {
         return [
             [TimeField::class, [12, 23, 34], '12:23:34'],

tests/Slurp/Transform/SlurpTransformer/TransformerTest.php

@@ -103,13 +103,15 @@ public function testTransformUndefinedField(): void
         );
     }
 
+    /**
+     * @requires PHPUnit < 10.0.0
+     */
     public function testTransformUndefinedFieldTriggersWarning(): void
     {
         $this->expectWarning();
         $this->expectExceptionMessage(
             'Unable to apply transformation for field \'bar\'. The supplied record did not contain this field.'
-        )
-        ;
+        );
 
         $mockChange = \Mockery::mock(Change::class);
         $mockChangeTransformer = \Mockery::mock(ChangeTransformerInterface::class);