From 2b86cfda4908a42d97873d9ae882a0e21b7ac65f Mon Sep 17 00:00:00 2001 From: Giancarlos Salas Date: Wed, 11 Jan 2023 11:21:33 -0500 Subject: [PATCH 1/5] Fix assertRegex deprecated --- .../tests/Xml/Parser/DespatchParserTest.php | 2 +- .../tests/Xml/Parser/InvoiceParserTest.php | 12 ++++++------ .../tests/Xml/Parser/PerceptionParserTest.php | 4 ++-- .../tests/Xml/Parser/RetentionParserTest.php | 4 ++-- .../tests/Xml/Parser/SummaryParserTest.php | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/xml-parser/tests/Xml/Parser/DespatchParserTest.php b/packages/xml-parser/tests/Xml/Parser/DespatchParserTest.php index 27eab8e9..a812fd19 100644 --- a/packages/xml-parser/tests/Xml/Parser/DespatchParserTest.php +++ b/packages/xml-parser/tests/Xml/Parser/DespatchParserTest.php @@ -31,7 +31,7 @@ public function testParseDoc($filename) $obj = $this->getParser()->parse($xml); $this->assertEquals('09', $obj->getTipoDoc()); - $this->assertRegExp('/^T\w{3}/', $obj->getSerie()); + $this->assertMatchesRegularExpression('/^T\w{3}/', $obj->getSerie()); $this->assertNotNull($obj->getCompany()); $this->assertNotNull($obj->getDestinatario()); $this->assertLessThanOrEqual(8, strlen($obj->getCorrelativo())); diff --git a/packages/xml-parser/tests/Xml/Parser/InvoiceParserTest.php b/packages/xml-parser/tests/Xml/Parser/InvoiceParserTest.php index aaa91b0a..edc18e85 100644 --- a/packages/xml-parser/tests/Xml/Parser/InvoiceParserTest.php +++ b/packages/xml-parser/tests/Xml/Parser/InvoiceParserTest.php @@ -28,8 +28,8 @@ public function testParseSunatSOL($filename) /**@var $obj Invoice */ $obj = $parser->parse($xml); - $this->assertRegExp('/^0\d{1}/', $obj->getTipoDoc()); - $this->assertRegExp('/^E\w{3}/', $obj->getSerie()); + $this->assertMatchesRegularExpression('/^0\d{1}/', $obj->getTipoDoc()); + $this->assertMatchesRegularExpression('/^E\w{3}/', $obj->getSerie()); $this->assertLessThanOrEqual(8, strlen($obj->getCorrelativo())); $this->assertNotEmpty($obj->getFechaEmision()); $this->assertGreaterThanOrEqual(1, count($obj->getDetails())); @@ -52,8 +52,8 @@ public function testFacParse($filename) /**@var $obj Invoice */ $obj = $parser->parse($xml); - $this->assertRegExp('/^0\d{1}/', $obj->getTipoDoc()); - $this->assertRegExp('/^[FB]\w{3}/', $obj->getSerie()); + $this->assertMatchesRegularExpression('/^0\d{1}/', $obj->getTipoDoc()); + $this->assertMatchesRegularExpression('/^[FB]\w{3}/', $obj->getSerie()); $this->assertLessThanOrEqual(8, strlen($obj->getCorrelativo())); $this->assertNotEmpty($obj->getFechaEmision()); $this->assertGreaterThanOrEqual(1, count($obj->getDetails())); @@ -71,8 +71,8 @@ public function testFacParseFromDoc() /**@var $obj Invoice */ $obj = $parser->parse($doc); - $this->assertRegExp('/^0\d{1}/', $obj->getTipoDoc()); - $this->assertRegExp('/^[FB]\w{3}/', $obj->getSerie()); + $this->assertMatchesRegularExpression('/^0\d{1}/', $obj->getTipoDoc()); + $this->assertMatchesRegularExpression('/^[FB]\w{3}/', $obj->getSerie()); $this->assertLessThanOrEqual(8, strlen($obj->getCorrelativo())); $this->assertNotEmpty($obj->getFechaEmision()); $this->assertGreaterThanOrEqual(1, count($obj->getDetails())); diff --git a/packages/xml-parser/tests/Xml/Parser/PerceptionParserTest.php b/packages/xml-parser/tests/Xml/Parser/PerceptionParserTest.php index 3dca1146..7530e1e2 100644 --- a/packages/xml-parser/tests/Xml/Parser/PerceptionParserTest.php +++ b/packages/xml-parser/tests/Xml/Parser/PerceptionParserTest.php @@ -26,8 +26,8 @@ public function testParseDoc($filename) /**@var $obj Perception */ $obj = $this->getParser()->parse($xml); - $this->assertRegExp('/^[P][0-9A-Z]{3}$/', $obj->getSerie()); - $this->assertRegExp('/^\d+$/', $obj->getCorrelativo()); + $this->assertMatchesRegularExpression('/^[P][0-9A-Z]{3}$/', $obj->getSerie()); + $this->assertMatchesRegularExpression('/^\d+$/', $obj->getCorrelativo()); $this->assertNotNull($obj->getCompany()); $this->assertNotNull($obj->getProveedor()); $this->assertGreaterThan(0, count($obj->getDetails())); diff --git a/packages/xml-parser/tests/Xml/Parser/RetentionParserTest.php b/packages/xml-parser/tests/Xml/Parser/RetentionParserTest.php index e47425ca..0c5d9b39 100644 --- a/packages/xml-parser/tests/Xml/Parser/RetentionParserTest.php +++ b/packages/xml-parser/tests/Xml/Parser/RetentionParserTest.php @@ -26,8 +26,8 @@ public function testParseDoc($filename) /**@var $obj Retention */ $obj = $this->getParser()->parse($xml); - $this->assertRegExp('/^[R][0-9A-Z]{3}$/', $obj->getSerie()); - $this->assertRegExp('/^\d+$/', $obj->getCorrelativo()); + $this->assertMatchesRegularExpression('/^[R][0-9A-Z]{3}$/', $obj->getSerie()); + $this->assertMatchesRegularExpression('/^\d+$/', $obj->getCorrelativo()); $this->assertNotNull($obj->getCompany()); $this->assertNotNull($obj->getProveedor()); $this->assertGreaterThan(0, count($obj->getDetails())); diff --git a/packages/xml-parser/tests/Xml/Parser/SummaryParserTest.php b/packages/xml-parser/tests/Xml/Parser/SummaryParserTest.php index de85a8a8..d7bd1ef8 100644 --- a/packages/xml-parser/tests/Xml/Parser/SummaryParserTest.php +++ b/packages/xml-parser/tests/Xml/Parser/SummaryParserTest.php @@ -27,14 +27,14 @@ public function testParseDoc($filename) $obj = $this->getParser()->parse($xml); $this->assertStringContainsString('RC', $obj->getName()); - $this->assertRegExp('/^\d+$/', $obj->getCorrelativo()); + $this->assertMatchesRegularExpression('/^\d+$/', $obj->getCorrelativo()); $this->assertNotNull($obj->getCompany()); $this->assertGreaterThan(0, count($obj->getDetails())); foreach ($obj->getDetails() as $detail) { $this->assertTrue(in_array($detail->getTipoDoc(), ['03', '07', '08'])); $this->assertTrue(in_array($detail->getEstado(), ['1', '2', '3'])); - $this->assertRegExp('/^B\d{3}-\d{1,8}$/', $detail->getSerieNro()); + $this->assertMatchesRegularExpression('/^B\d{3}-\d{1,8}$/', $detail->getSerieNro()); $this->assertTrue(is_float($detail->getTotal())); if ($detail->getDocReferencia()) { $ref = $detail->getDocReferencia(); From 40f83383f1c7c0827853ce3ba93be2e1e501fafa Mon Sep 17 00:00:00 2001 From: Giancarlos Salas Date: Wed, 11 Jan 2023 11:53:47 -0500 Subject: [PATCH 2/5] Update v5 --- packages/core/composer.json | 2 +- packages/cpe-validator/composer.json | 2 +- packages/data/composer.json | 4 ++-- packages/htmltopdf/composer.json | 4 ++-- packages/lite/composer.json | 8 ++++---- packages/report/composer.json | 6 +++--- packages/validator/composer.json | 4 ++-- packages/ws/composer.json | 4 ++-- packages/xcodes/composer.json | 4 ++-- packages/xml-parser/composer.json | 4 ++-- packages/xml/composer.json | 6 +++--- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/core/composer.json b/packages/core/composer.json index 5daa2aee..1390d27c 100644 --- a/packages/core/composer.json +++ b/packages/core/composer.json @@ -24,7 +24,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/cpe-validator/composer.json b/packages/cpe-validator/composer.json index c7d1402f..9ab4ae90 100644 --- a/packages/cpe-validator/composer.json +++ b/packages/cpe-validator/composer.json @@ -34,7 +34,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/data/composer.json b/packages/data/composer.json index d75dc4f5..632ef980 100644 --- a/packages/data/composer.json +++ b/packages/data/composer.json @@ -16,7 +16,7 @@ "type": "library", "require": { "php": ">=7.4", - "greenter/core": "^4.4" + "greenter/core": "^5.0" }, "autoload": { "psr-4": { @@ -25,7 +25,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/htmltopdf/composer.json b/packages/htmltopdf/composer.json index c82ce32a..87517d04 100644 --- a/packages/htmltopdf/composer.json +++ b/packages/htmltopdf/composer.json @@ -16,7 +16,7 @@ "type": "library", "require": { "php": ">=7.4", - "greenter/core": "^4.4", + "greenter/core": "^5.0", "mikehaertl/phpwkhtmltopdf": "^2.4" }, "require-dev": { @@ -37,7 +37,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/lite/composer.json b/packages/lite/composer.json index 791fd2cd..44bd2198 100644 --- a/packages/lite/composer.json +++ b/packages/lite/composer.json @@ -18,9 +18,9 @@ "php": ">=7.4", "ext-dom": "*", "greenter/xmldsig": "^5.0", - "greenter/core": "^4.4", - "greenter/ws": "^4.4", - "greenter/xml": "^4.4" + "greenter/core": "^5.0", + "greenter/ws": "^5.0", + "greenter/xml": "^5.0" }, "require-dev": { "phpunit/phpunit": "^9" @@ -37,7 +37,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/report/composer.json b/packages/report/composer.json index 84cba6b2..e4123437 100644 --- a/packages/report/composer.json +++ b/packages/report/composer.json @@ -17,12 +17,12 @@ "require": { "php": ">=7.4", "twig/twig": "~3.0", - "greenter/core": "^4.4", + "greenter/core": "^5.0", "bacon/bacon-qr-code": "^2.0" }, "require-dev": { "phpunit/phpunit": "^9", - "greenter/data": "^4.4" + "greenter/data": "^5.0" }, "autoload": { "psr-4": { @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/validator/composer.json b/packages/validator/composer.json index e65caf45..d681be89 100644 --- a/packages/validator/composer.json +++ b/packages/validator/composer.json @@ -16,7 +16,7 @@ "type": "library", "require": { "php": ">=7.4", - "greenter/core": "^4.4", + "greenter/core": "^5.0", "symfony/validator": "^5.0 || ^6.0" }, "require-dev": { @@ -34,7 +34,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/ws/composer.json b/packages/ws/composer.json index bd7086ab..69961328 100644 --- a/packages/ws/composer.json +++ b/packages/ws/composer.json @@ -19,7 +19,7 @@ "ext-zlib": "*", "ext-dom": "*", "ext-soap": "*", - "greenter/core": "^4.4", + "greenter/core": "^5.0", "greenter/gre-api": "^1.0", "nelexa/zip": "^4.0" }, @@ -42,7 +42,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/xcodes/composer.json b/packages/xcodes/composer.json index 4738164c..9cee6200 100644 --- a/packages/xcodes/composer.json +++ b/packages/xcodes/composer.json @@ -16,7 +16,7 @@ "type": "library", "require": { "php": ">=7.4", - "greenter/core": "^4.4" + "greenter/core": "^5.0" }, "require-dev": { "phpunit/phpunit": "^9" @@ -33,7 +33,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/xml-parser/composer.json b/packages/xml-parser/composer.json index 4ac1b4d9..1fa91742 100644 --- a/packages/xml-parser/composer.json +++ b/packages/xml-parser/composer.json @@ -17,7 +17,7 @@ "require": { "php": ">=7.4", "ext-dom": "*", - "greenter/core": "^4.4" + "greenter/core": "^5.0" }, "autoload": { "psr-4": { @@ -31,7 +31,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } diff --git a/packages/xml/composer.json b/packages/xml/composer.json index 14ffcdee..b4834f35 100644 --- a/packages/xml/composer.json +++ b/packages/xml/composer.json @@ -16,11 +16,11 @@ "type": "library", "require": { "php": ">=7.4", - "greenter/core": "^4.4", + "greenter/core": "^5.0", "twig/twig": "~3.0" }, "require-dev": { - "greenter/data": "^4.4", + "greenter/data": "^5.0", "greenter/ubl-validator": "^2.0", "phpunit/phpunit": "^9" }, @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } } } From b9f1c53139876256daee86febf78de5306bbff66 Mon Sep 17 00:00:00 2001 From: Giancarlos Salas Date: Wed, 11 Jan 2023 11:55:30 -0500 Subject: [PATCH 3/5] Update monorepo config --- monorepo-builder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monorepo-builder.php b/monorepo-builder.php index 5585a486..a1d9e48c 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -22,8 +22,8 @@ $mbConfig->dataToRemove([ 'require-dev' => [ - 'phpstan/phpstan' => '^1.8', - 'vimeo/psalm' => '^4.4', + 'phpstan/phpstan' => '^1.9', + 'vimeo/psalm' => '^5.4', ], ]); From 54d9aef7ff4155fa5cab3138399f6cf4164b2ab9 Mon Sep 17 00:00:00 2001 From: Giancarlos Salas Date: Wed, 11 Jan 2023 12:01:40 -0500 Subject: [PATCH 4/5] Add test tag --- packages/lite/tests/Greenter/ApiTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/lite/tests/Greenter/ApiTest.php b/packages/lite/tests/Greenter/ApiTest.php index 51c0d31c..8e7aad8f 100644 --- a/packages/lite/tests/Greenter/ApiTest.php +++ b/packages/lite/tests/Greenter/ApiTest.php @@ -15,6 +15,10 @@ use Greenter\Model\Response\SummaryResult; use PHPUnit\Framework\TestCase; +/** + * Class ApiTest + * @group integration + */ class ApiTest extends TestCase { public function testSend(): void From 341b6612f8239e2d734f90dadeead3e4926f7e1f Mon Sep 17 00:00:00 2001 From: Giancarlos Salas Date: Wed, 11 Jan 2023 12:02:05 -0500 Subject: [PATCH 5/5] Update php 8.2 (CI) --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 395d5beb..9f196b61 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - php: ['8.0'] + php: ['8.2'] report-coverage: [false] include: - php: '7.4'