Merge pull request #35 from flagbit/fix-assetic-deprecation

Replace deprecated assetic bundle with lessjs
flagbit · Sep 23, 2019 · 6f5187d · 6f5187d
2 parents 55e98bf + eb76470
commit 6f5187d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git 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

diff --git 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",

diff --git a/src/Resources/config/assets.yml b/src/Resources/config/assets.yml
diff --git a/src/Resources/public/less/index.less 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 → ...Resources/public/less/tableattribute.less b/src/Resources/public/css/tableattribute.less → ...Resources/public/less/tableattribute.less
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import "./web/bundles/flagbittableattribute/less/tableattribute.less";