Skip to content

Commit

Permalink
Merge pull request #97 from EaDesgin/feature/Eadesigndev-Pdfgenerator…
Browse files Browse the repository at this point in the history
…-upgrade

Eadesigndev_Pdfgenerator: Fix bug and upgrade to M234 and PHP 7.3
  • Loading branch information
eadesignro authored Apr 16, 2020
2 parents 2381cdd + 9c35c06 commit abf8e65
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 72 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -13,22 +13,22 @@ 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 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: |
export COMPOSER_MEMORY_LIMIT=-1
sudo composer self-update
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
Expand All @@ -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
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
2 changes: 1 addition & 1 deletion Model/Email/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Message extends \Magento\Framework\Mail\Message implements MailMessageInte

private $mimeMessageFactory;

private $zendMessage;
protected $zendMessage;

private $attachment;

Expand Down
104 changes: 52 additions & 52 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]",
"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": "[email protected]",
"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
}

20 changes: 10 additions & 10 deletions etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © EAdesign by Eco Active S.R.L.,All rights reserved.
* See LICENSE for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Eadesigndev_Pdfgenerator" setup_version="1.2.9"/>
</config>
<?xml version="1.0"?>
<!--
/**
* Copyright © EAdesign by Eco Active S.R.L.,All rights reserved.
* See LICENSE for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Eadesigndev_Pdfgenerator" setup_version="1.2.10"/>
</config>

0 comments on commit abf8e65

Please sign in to comment.