Merge pull request #2 from stof/symfony_4

Add support for Symfony 4
Incenteev · Feb 21, 2018 · 82f1ad3 · 82f1ad3
2 parents 3149cca + 18152b0
commit 82f1ad3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,15 +5,20 @@ sudo: false
 php:
   - 7.0
   - 7.1
+  - 7.2
   - nightly
 
 matrix:
   fast_finish: true
   include:
     - php: 7.0
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+    # Test LTS versions
     - php: 7.1
-      env: DEPENDENCIES=dev SYMFONY_DEPRECATIONS_HELPER=weak
+      env: DEPENDENCIES="dunglas/symfony-lock:^3"
+    # Test unstable versions
+    - php: 7.2
+      env: STABILITY="dev"
   allow_failures:
     - php: nightly
 
@@ -22,8 +27,9 @@ cache:
     - $HOME/.composer/cache/files
 
 before_install:
-  - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
+  - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
+  - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
 
-install: composer update $COMPOSER_FLAGS
+install: composer update $COMPOSER_FLAGS --prefer-dist --no-interaction
 
 script: phpunit -v
diff --git a/composer.json b/composer.json
@@ -11,16 +11,16 @@
     ],
     "require": {
         "php": "^7.0",
-        "symfony/asset": "^3.2",
-        "symfony/cache": "^3.2",
-        "symfony/config": "^3.2",
-        "symfony/dependency-injection": "^3.2",
-        "symfony/finder": "^3.2",
-        "symfony/framework-bundle": "^3.2",
-        "symfony/http-kernel": "^3.2"
+        "symfony/asset": "^3.2 || ^4.0",
+        "symfony/cache": "^3.2 || ^4.0",
+        "symfony/config": "^3.2 || ^4.0",
+        "symfony/dependency-injection": "^3.2 || ^4.0",
+        "symfony/finder": "^3.2 || ^4.0",
+        "symfony/framework-bundle": "^3.2 || ^4.0",
+        "symfony/http-kernel": "^3.2 || ^4.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^3.2"
+        "symfony/phpunit-bridge": "^4.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/CacheWarmer/AssetFinder.php b/src/CacheWarmer/AssetFinder.php
@@ -5,6 +5,9 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 
+/**
+ * @internal
+ */
 class AssetFinder
 {
     private $webRoot;

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Flex\Recipe;
 
 class Configuration implements ConfigurationInterface
 {
@@ -16,7 +17,7 @@ public function getConfigTreeBuilder()
         $rootNode = $treeBuilder->root('incenteev_hashed_asset');
 
         $rootNode->children()
-            ->scalarNode('web_root')->defaultValue('%kernel.root_dir%/../web')->end()
+            ->scalarNode('web_root')->defaultValue(\class_exists(Recipe::class) ? '%kernel.project_dir%/public' : '%kernel.root_dir%/../web')->end()
             ->scalarNode('version_format')->defaultValue('%%s?%%s')->end()
         ;
 

diff --git a/src/Hashing/FileHasher.php b/src/Hashing/FileHasher.php
@@ -10,6 +10,7 @@ public function __construct(string $webRoot)
     {
         $this->webRoot = $webRoot;
     }
+
     public function computeHash(string $path): string
     {
         $fullPath = $this->webRoot.'/'.ltrim($path, '/');