From b6c3d3c23e5b1cb4ba9490ddaed2c7cb352259d6 Mon Sep 17 00:00:00 2001 From: Mihai Ardeleanu Date: Fri, 10 Apr 2020 18:50:07 +0300 Subject: [PATCH 1/5] Eadesigndev_Pdfgenerator: Fix bug and upgrade to M234 and PHP 7.3 --- Model/Email/Message.php | 2 +- composer.json | 104 ++++++++++++++++++++-------------------- etc/module.xml | 20 ++++---- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Model/Email/Message.php b/Model/Email/Message.php index cf0fda0..b91e58c 100644 --- a/Model/Email/Message.php +++ b/Model/Email/Message.php @@ -21,7 +21,7 @@ class Message extends \Magento\Framework\Mail\Message implements MailMessageInte private $mimeMessageFactory; - private $zendMessage; + protected $zendMessage; private $attachment; diff --git a/composer.json b/composer.json index 31dacd3..94c9601 100644 --- a/composer.json +++ b/composer.json @@ -1,52 +1,52 @@ -{ - "name": "eadesignro/module-pdfgenerator", - "description": "The best pdf generator for Magento. EaDesign PDF Generator", - "type": "magento2-module", - "version": "1.2.9", - "autoload": { - "files": [ - "registration.php" - ], - "psr-4": { - "Eadesigndev\\Pdfgenerator\\": "" - } - }, - "repositories": [ - { - "type": "composer", - "url": "https://repo.magento.com/" - } - ], - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "EaDesign", - "email": "office@eadesign.ro", - "homepage": "https://www.eadesign.ro/", - "role": "Developer" - } - ], - "require": { - "php": "~7.1.3|~7.2.0", - "magento/module-backend": "101.0.*", - "magento/module-sales": "102.0.*", - "magento/framework": "~102.0.1", - "eadesignro/module-eacore": "^0.2.10", - "mpdf/mpdf": "7.1.*" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.13.0", - "lusitanian/oauth": "~0.8.10", - "magento/magento2-functional-testing-framework": "2.3.9", - "pdepend/pdepend": "2.5.2", - "phpmd/phpmd": "@stable", - "phpunit/phpunit": "~6.5.0", - "sebastian/phpcpd": "~3.0.0", - "squizlabs/php_codesniffer": "3.3.1" - }, - "minimum-stability": "dev", - "prefer-stable": true -} - +{ + "name": "eadesignro/module-pdfgenerator", + "description": "The best pdf generator for Magento. EaDesign PDF Generator", + "type": "magento2-module", + "version": "1.2.10", + "autoload": { + "files": [ + "registration.php" + ], + "psr-4": { + "Eadesigndev\\Pdfgenerator\\": "" + } + }, + "repositories": [ + { + "type": "composer", + "url": "https://repo.magento.com/" + } + ], + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "EaDesign", + "email": "office@eadesign.ro", + "homepage": "https://www.eadesign.ro/", + "role": "Developer" + } + ], + "require": { + "php": "~7.1.3|~7.2.0|~7.3.0", + "magento/module-backend": "101.0.*", + "magento/module-sales": "102.0.*", + "magento/framework": "~102.0.1", + "eadesignro/module-eacore": "^0.2.10", + "mpdf/mpdf": "7.1.*" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.13.0", + "lusitanian/oauth": "~0.8.10", + "magento/magento2-functional-testing-framework": "2.3.9", + "pdepend/pdepend": "2.5.2", + "phpmd/phpmd": "@stable", + "phpunit/phpunit": "~6.5.0", + "sebastian/phpcpd": "~3.0.0", + "squizlabs/php_codesniffer": "3.3.1" + }, + "minimum-stability": "dev", + "prefer-stable": true +} + diff --git a/etc/module.xml b/etc/module.xml index 6e094ee..74f162b 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,10 +1,10 @@ - - - - - + + + + + From ffde1f74e2cb11b1545654a95d9c4da8457723bd Mon Sep 17 00:00:00 2001 From: Mihai Ardeleanu Date: Fri, 10 Apr 2020 19:04:50 +0300 Subject: [PATCH 2/5] Eadesigndev_Pdfgenerator: Add CircleCi compatobility to M234 and PHP 7.3 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b74e5f..1a5657a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: circleci/php:7.1-node-browsers + - image: circleci/php:7.3-node-browsers working_directory: ~/magento @@ -28,7 +28,7 @@ jobs: mkdir ~/.composer touch ~/.composer/auth.json echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_KEY}\",\"password\":\"${MAGENTO_SECRET}\"}}}" > ~/.composer/auth.json - composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition . 2.3.0 + composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition . 2.3.4 composer require mpdf/mpdf composer require eadesignro/module-eacore mkdir -p app/code/Eadesigndev/Pdfgenerator @@ -43,4 +43,4 @@ jobs: composer create-project --repository=https://repo.magento.com magento/marketplace-eqp magento-coding-standard php magento-coding-standard/vendor/bin/phpcs --standard=app/code/Eadesigndev/Pdfgenerator/Test/Php/_files/phpcs/ruleset.xml app/code/Eadesigndev/Pdfgenerator/Api/ app/code/Eadesigndev/Pdfgenerator/Block/ app/code/Eadesigndev/Pdfgenerator/Controller/ app/code/Eadesigndev/Pdfgenerator/Helper/ app/code/Eadesigndev/Pdfgenerator/Model/ app/code/Eadesigndev/Pdfgenerator/Setup/ app/code/Eadesigndev/Pdfgenerator/Test/ app/code/Eadesigndev/Pdfgenerator/Ui/ app/code/Eadesigndev/Pdfgenerator/view/ php vendor/bin/phpmd app/code/Eadesigndev/Pdfgenerator/Api/,app/code/Eadesigndev/Pdfgenerator/Block/,app/code/Eadesigndev/Pdfgenerator/Controller/,app/code/Eadesigndev/Pdfgenerator/Helper/,app/code/Eadesigndev/Pdfgenerator/Model/,app/code/Eadesigndev/Pdfgenerator/Setup/,app/code/Eadesigndev/Pdfgenerator/Ui/,app/code/Eadesigndev/Pdfgenerator/view/ text app/code/Eadesigndev/Pdfgenerator/Test/Php/_files/phpmd/ruleset.xml - php vendor/bin/phpunit app/code/Eadesigndev/Pdfgenerator/Test/ --config dev/tests/unit/phpunit.xml.dist --coverage-clover=app/code/Eadesigndev/Pdfgenerator/build/logs/clover.xml \ No newline at end of file + php vendor/bin/phpunit app/code/Eadesigndev/Pdfgenerator/Test/ --config dev/tests/unit/phpunit.xml.dist --coverage-clover=app/code/Eadesigndev/Pdfgenerator/build/logs/clover.xml From 8efb7c4f17db357f2fa1e6a16ca3236156842fe4 Mon Sep 17 00:00:00 2001 From: Mihai Ardeleanu Date: Fri, 10 Apr 2020 19:17:33 +0300 Subject: [PATCH 3/5] Eadesigndev_Pdfgenerator: CircleCi - fix environment variables keeping --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a5657a..1a0d4ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,14 +13,14 @@ jobs: name: Setup test environment command: | sudo apt-get install -y libpng-dev - sudo docker-php-ext-install gd - sudo docker-php-ext-install bcmath + sudo -E docker-php-ext-install gd + sudo -E docker-php-ext-install bcmath sudo apt-get install -y libmcrypt-dev - sudo docker-php-ext-install mcrypt + sudo -E docker-php-ext-install mcrypt sudo apt-get install -y libxslt-dev - sudo docker-php-ext-install xsl - sudo docker-php-ext-install pdo_mysql - sudo docker-php-ext-install soap + sudo -E docker-php-ext-install xsl + sudo -E docker-php-ext-install pdo_mysql + sudo -E docker-php-ext-install soap - run: name: Setup composer details command: | From f62a855a5cf421ad0c0135b1bf0ea7431c276999 Mon Sep 17 00:00:00 2001 From: Mihai Ardeleanu Date: Fri, 10 Apr 2020 19:27:32 +0300 Subject: [PATCH 4/5] Eadesigndev_Pdfgenerator: CircleCi - fix environment variables keeping --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a0d4ef..eb823ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,6 @@ jobs: sudo -E docker-php-ext-install gd sudo -E docker-php-ext-install bcmath sudo apt-get install -y libmcrypt-dev - sudo -E docker-php-ext-install mcrypt sudo apt-get install -y libxslt-dev sudo -E docker-php-ext-install xsl sudo -E docker-php-ext-install pdo_mysql From 9c35c061e279daae1b9cdd3c75ee036a073de8f7 Mon Sep 17 00:00:00 2001 From: Mihai Ardeleanu Date: Fri, 10 Apr 2020 19:55:57 +0300 Subject: [PATCH 5/5] Eadesigndev_Pdfgenerator: CircleCi - composer memory_limit --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb823ef..bdbaae3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,7 @@ jobs: - run: name: Setup composer details command: | + export COMPOSER_MEMORY_LIMIT=-1 sudo composer self-update mkdir ~/.composer touch ~/.composer/auth.json