diff --git a/.gitattributes b/.gitattributes index 3c03e0c..a1557ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,5 +11,4 @@ Dockerfile linguist-detectable=false /Dockerfile export-ignore /docker-compose.yml export-ignore /entrypoint.sh export-ignore -/phpcs.xml export-ignore /phpunit.xml export-ignore diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 688a26a..0b39c42 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -111,7 +111,7 @@ 'no_empty_comment' => true, 'no_trailing_whitespace_in_comment' => true, 'single_line_comment_spacing' => true, - 'single_line_comment_style' => ['comment_types' => ['asterisk', 'hash']] + 'single_line_comment_style' => ['comment_types' => ['hash']] ]; $constantNotationRules = [ diff --git a/tests/ErrorWarningTest.php b/tests/ErrorWarningTest.php index 1fc8203..45ce716 100644 --- a/tests/ErrorWarningTest.php +++ b/tests/ErrorWarningTest.php @@ -63,11 +63,11 @@ public function testErrorField(): void $implem->addErrorField('field 2', 'invalid 11'); static::assertTrue($implem->hasErrorFields()); - static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11']], $implem->getErrorFields()); // phpcs:ignore + static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11']], $implem->getErrorFields()); $implem->addErrorField('field 2', 'invalid 22'); static::assertTrue($implem->hasErrorFields()); - static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11', 'invalid 22']], $implem->getErrorFields()); // phpcs:ignore + static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11', 'invalid 22']], $implem->getErrorFields()); $implem->resetErrorField('field 2'); static::assertTrue($implem->hasErrorFields()); @@ -94,11 +94,11 @@ public function testWarningField(): void $implem->addWarningField('field 2', 'invalid 11'); static::assertTrue($implem->hasWarningFields()); - static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11']], $implem->getWarningFields()); // phpcs:ignore + static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11']], $implem->getWarningFields()); $implem->addWarningField('field 2', 'invalid 22'); static::assertTrue($implem->hasWarningFields()); - static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11', 'invalid 22']], $implem->getWarningFields()); // phpcs:ignore + static::assertSame(['field 1' => ['invalid 1', 'invalid 2'], 'field 2' => ['invalid 11', 'invalid 22']], $implem->getWarningFields()); $implem->resetWarningField('field 2'); static::assertTrue($implem->hasWarningFields()); diff --git a/tests/FieldTest.php b/tests/FieldTest.php index 8865b96..ef57911 100644 --- a/tests/FieldTest.php +++ b/tests/FieldTest.php @@ -21,7 +21,7 @@ class FieldTest extends TestCase public function testFieldExceptionInvalidType(): void { $this->expectException(FieldException::class); - $this->expectExceptionMessage('Incorrect Type. Valid type: int, float, char, varchar, text, date, datetime, time, timestamp, year, enum:v1,v2'); // phpcs:ignore + $this->expectExceptionMessage('Incorrect Type. Valid type: int, float, char, varchar, text, date, datetime, time, timestamp, year, enum:v1,v2'); new Field('invalid'); } @@ -29,7 +29,7 @@ public function testFieldExceptionInvalidType(): void public function testFieldExceptionInvalidRule(): void { $this->expectException(FieldException::class); - $this->expectExceptionMessage('Incorrect Rule. Valid rule: pk, fk, unsigned, email, not_null, max, min, range, max:int, min:int, range:int,int'); // phpcs:ignore + $this->expectExceptionMessage('Incorrect Rule. Valid rule: pk, fk, unsigned, email, not_null, max, min, range, max:int, min:int, range:int,int'); new Field('int', ['invalid']); } @@ -71,8 +71,6 @@ public function testFieldDefault(): void public static function provideFieldFormatDataCases(): iterable { - // phpcs:disable - // char yield 'char' => [ 'fieldType' => 'char', @@ -1606,15 +1604,13 @@ public static function provideFieldFormatDataCases(): iterable 'expected' => [null, null, FieldException::class, '-1', '10', '50.5', ''], 'message' => [null, null, 'invalid azerty value', null, null, null, null] ]; - - // phpcs:enable } // endregion /** @throws FieldException */ #[DataProvider('provideFieldFormatDataCases')] - public function testFieldFormat(string $fieldType, array $rules, $default, array $input, array $expected, array $message): void // phpcs:ignore + public function testFieldFormat(string $fieldType, array $rules, $default, array $input, array $expected, array $message): void { $rule = new Field($fieldType, $rules, $default); for ($i = 0, $max = \count($input); $i < $max; ++$i) { diff --git a/tests/ModelTest.php b/tests/ModelTest.php index 17be6ff..b5e49d0 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -1,8 +1,6 @@ [ @@ -249,9 +247,9 @@ class ModelTest extends TestCase external_id int ); EOD, - "INSERT INTO crud_table VALUES (1, 'first', '{{DATE_START}}', null, null, null, 'yes', null, null, null)", // phpcs:ignore - "INSERT INTO crud_table VALUES (2, 'secon', '2018-08-07 20:06:23', null, null, null, 'yes', null, null, null)", // phpcs:ignore - "INSERT INTO crud_table VALUES (3, 'third', '2018-08-07 20:06:23', null, null, null, 'yes', null, null, null)", // phpcs:ignore + "INSERT INTO crud_table VALUES (1, 'first', '{{DATE_START}}', null, null, null, 'yes', null, null, null)", + "INSERT INTO crud_table VALUES (2, 'secon', '2018-08-07 20:06:23', null, null, null, 'yes', null, null, null)", + "INSERT INTO crud_table VALUES (3, 'third', '2018-08-07 20:06:23', null, null, null, 'yes', null, null, null)", ], ], 'sqlite' => [ @@ -290,9 +288,9 @@ class ModelTest extends TestCase ); EOD, 'create unique index crud_table_external_id_uindex on crud_table (external_id);', - "INSERT INTO crud_table VALUES (1, 'first', '{{DATE_START}}', null, '00:00:00', null, 'yes', null, null, null)", // phpcs:ignore - "INSERT INTO crud_table VALUES (2, 'secon', '2018-08-07 20:06:23', null, '00:00:00', null, 'yes', null, null, null)", // phpcs:ignore - "INSERT INTO crud_table VALUES (3, 'third', '2018-08-07 20:06:23', null, '00:00:00', null, 'yes', null, null, null)", // phpcs:ignore + "INSERT INTO crud_table VALUES (1, 'first', '{{DATE_START}}', null, '00:00:00', null, 'yes', null, null, null)", + "INSERT INTO crud_table VALUES (2, 'secon', '2018-08-07 20:06:23', null, '00:00:00', null, 'yes', null, null, null)", + "INSERT INTO crud_table VALUES (3, 'third', '2018-08-07 20:06:23', null, '00:00:00', null, 'yes', null, null, null)", ], ], ]; @@ -314,7 +312,7 @@ protected function setUp(): void if ($configurator->getDriver() === 'pgsql') { $postgresHost = \getenv('POSTGRES_HOST', true); - $configurator->setHost(($postgresHost !== false) ? $postgresHost : $this->sgbds[$k]['parameters']['host']); // phpcs:ignore + $configurator->setHost(($postgresHost !== false) ? $postgresHost : $this->sgbds[$k]['parameters']['host']); } $this->sgbds[$k]['db'] = new Database($configurator); @@ -820,7 +818,7 @@ public function testUpdate(string $sgbd): void } $implem = new ImplementModel($this->sgbds[$sgbd]['db']); - $implem->update(['title' => 'youpie', 'param_to_remove' => 'this will be remove in parametersToRemove function'], 1); // phpcs:ignore + $implem->update(['title' => 'youpie', 'param_to_remove' => 'this will be remove in parametersToRemove function'], 1); $row = $implem->one(1); static::assertSame('youpi', $row['title']); @@ -958,7 +956,7 @@ public function testCallbacks(string $sgbd): void $implem->addBeforeCreate('b', static function ($sql, $params) { static::assertSame('toto', $sql); - $sql = 'INSERT INTO crud_table (`title`,`date_start`, `year_start`) VALUES (:title,:date_start, :year_start)'; // phpcs:ignore + $sql = 'INSERT INTO crud_table (`title`,`date_start`, `year_start`) VALUES (:title,:date_start, :year_start)'; $params['year_start'] = 1956; static::assertSame('az', $params['title']);