From aee37a1e411ef03c944bf8249dc9f5454636b16e Mon Sep 17 00:00:00 2001 From: Antonio Mansilla Date: Tue, 10 Sep 2019 12:38:44 +0200 Subject: [PATCH 1/3] Replace deprecated assetic bundle with lessjs Fix issue #34. Akeneo BC break introduzed here: https://github.com/akeneo/pim-community-dev/commit/720ac3e6229dea2224658b4a77c064ff990b8958 --- src/Resources/config/assets.yml | 3 --- src/Resources/public/less/index.less | 1 + src/Resources/public/{css => less}/tableattribute.less | 0 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 src/Resources/config/assets.yml create mode 100644 src/Resources/public/less/index.less rename src/Resources/public/{css => less}/tableattribute.less (100%) diff --git a/src/Resources/config/assets.yml b/src/Resources/config/assets.yml deleted file mode 100644 index 9b89bb1..0000000 --- a/src/Resources/config/assets.yml +++ /dev/null @@ -1,3 +0,0 @@ -css: - tableattribute: - - bundles/flagbittableattribute/css/tableattribute.less diff --git a/src/Resources/public/less/index.less b/src/Resources/public/less/index.less new file mode 100644 index 0000000..1323239 --- /dev/null +++ b/src/Resources/public/less/index.less @@ -0,0 +1 @@ +@import "./web/bundles/flagbittableattribute/less/tableattribute.less"; diff --git a/src/Resources/public/css/tableattribute.less b/src/Resources/public/less/tableattribute.less similarity index 100% rename from src/Resources/public/css/tableattribute.less rename to src/Resources/public/less/tableattribute.less From 687546234ed3e6f506501d8d2fecc20ca1185f19 Mon Sep 17 00:00:00 2001 From: Antonio Mansilla Date: Tue, 10 Sep 2019 13:00:47 +0200 Subject: [PATCH 2/3] Require only supported Akeneo versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c59e043..4bc2215 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ ], "require": { "ext-json": "*", - "akeneo/pim-community-dev": "~3.0.21 || ~3.2.0" + "akeneo/pim-community-dev": "^3.2" }, "require-dev": { "phpspec/phpspec": "^5.1", From eb76470843d48c908e485c416bce6e14717095a3 Mon Sep 17 00:00:00 2001 From: Antonio Mansilla Date: Tue, 10 Sep 2019 13:24:30 +0200 Subject: [PATCH 3/3] Add Akeneo required PHP extensions for travisci --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 35f6203..049c5cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,10 @@ before_install: # disable default memory limit - export INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo memory_limit = -1 >> $INI + - echo "extension = apcu.so" >> $INI + - pear config-set preferred_state beta + - pecl channel-update pecl.php.net + - yes | pecl install imagick install: - travis_retry composer install $COMPOSER_OPTS