Merge pull request #645 from liip/travis

updated build matrix
liip · Oct 26, 2015 · 41d7dd3 · 41d7dd3
2 parents 277d425 + 83de9f7
commit 41d7dd3
Show file tree

Hide file tree

Showing 51 changed files with 186 additions and 192 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1 @@
+preset: symfony
diff --git a/.travis.yml b/.travis.yml
@@ -3,42 +3,41 @@ language: php
 php:
   - 5.3
   - 5.4
-  - 5.5
   - 5.6
+  - 5.6
+  - 7.0
   - hhvm
 
-env:
-  - SYMFONY_VERSION="~2.3||~3.0" SYMFONY_DEPRECATIONS_HELPER=weak
-
 sudo: false
 
-before_script:
-  - yes '' | pecl -q install -f mongo
-  - composer self-update
-  - sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
-  - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
-  - composer install --dev --prefer-source
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
-script: ./bin/phpunit --coverage-text
+env:
+  - SYMFONY_VERSION=2.7.*
 
 matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master
-    - php: hhvm
   include:
-    - php: 5.5
+    - php: 5.6
       env: SYMFONY_VERSION=2.3.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.4.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.5.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.6.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.5
-      env: SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.5
-      env: SYMFONY_VERSION=3.0.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.5
-      env: SYMFONY_VERSION=dev-master
+    - php: 5.6
+      env: SYMFONY_VERSION=2.8.*@dev
+    - php: 5.6
+      env: SYMFONY_VERSION=3.0.*@dev
+    - php: 5.3
+      env: COMPOSER_FLAGS="--prefer-lowest"
+  allow_failures:
+    - env: SYMFONY_VERSION=3.0.*@dev
+    - php: 7.0
+    - php: hhvm
+
+before_install:
+  - yes '' | pecl -q install -f mongo
+  - sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
+  - composer self-update
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
+
+install: composer update --prefer-source $COMPOSER_FLAGS
+
+script: ./bin/phpunit --coverage-text
diff --git a/Binary/Loader/AbstractDoctrineLoader.php b/Binary/Loader/AbstractDoctrineLoader.php
@@ -46,7 +46,7 @@ abstract protected function mapPathToId($path);
     abstract protected function getStreamFromImage($image);
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($path)
     {

diff --git a/Binary/Loader/FileSystemLoader.php b/Binary/Loader/FileSystemLoader.php
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($path)
     {

diff --git a/Binary/Loader/GridFSLoader.php b/Binary/Loader/GridFSLoader.php
@@ -28,7 +28,7 @@ public function __construct(DocumentManager $dm, $class)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($id)
     {

diff --git a/Binary/Loader/StreamLoader.php b/Binary/Loader/StreamLoader.php
@@ -38,7 +38,7 @@ public function __construct($wrapperPrefix, $context = null)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($path)
     {

diff --git a/Binary/SimpleMimeTypeGuesser.php b/Binary/SimpleMimeTypeGuesser.php
@@ -20,7 +20,7 @@ public function __construct(SymfonyMimeTypeGuesserInterface $mimeTypeGuesser)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function guess($binary)
     {

diff --git a/Command/RemoveCacheCommand.php b/Command/RemoveCacheCommand.php
@@ -16,11 +16,11 @@ protected function configure()
         $this
             ->setName('liip:imagine:cache:remove')
             ->setDescription('Remove cache for given paths and set of filters.')
-            ->addArgument('paths', InputArgument::OPTIONAL|InputArgument::IS_ARRAY, 'Image paths')
+            ->addArgument('paths', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Image paths')
             ->addOption(
                 'filters',
                 'f',
-                InputOption::VALUE_OPTIONAL|InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 'Filters list'
             )
             ->setHelp(<<<EOF
@@ -46,14 +46,14 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $paths = $input->getArgument('paths');
-        $filters =  $input->getOption('filters');
+        $filters = $input->getOption('filters');
 
         if (empty($filters)) {
             $filters = null;
         }
 
         /* @var CacheManager cacheManager */
-        $cacheManager  = $this->getContainer()->get('liip_imagine.cache.manager');
+        $cacheManager = $this->getContainer()->get('liip_imagine.cache.manager');
 
         $cacheManager->remove($paths, $filters);
     }

diff --git a/Command/ResolveCacheCommand.php b/Command/ResolveCacheCommand.php
@@ -18,11 +18,11 @@ protected function configure()
         $this
             ->setName('liip:imagine:cache:resolve')
             ->setDescription('Resolve cache for given path and set of filters.')
-            ->addArgument('paths', InputArgument::REQUIRED|InputArgument::IS_ARRAY, 'Image paths')
+            ->addArgument('paths', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'Image paths')
             ->addOption(
                 'filters',
                 'f',
-                InputOption::VALUE_OPTIONAL|InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 'Filters list'
             )->setHelp(<<<EOF
 The <info>%command.name%</info> command resolves cache by specified parameters.
@@ -57,9 +57,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /* @var FilterManager filterManager */
         $filterManager = $this->getContainer()->get('liip_imagine.filter.manager');
         /* @var CacheManager cacheManager */
-        $cacheManager  = $this->getContainer()->get('liip_imagine.cache.manager');
+        $cacheManager = $this->getContainer()->get('liip_imagine.cache.manager');
         /* @var DataManager dataManager */
-        $dataManager   = $this->getContainer()->get('liip_imagine.data.manager');
+        $dataManager = $this->getContainer()->get('liip_imagine.data.manager');
 
         if (empty($filters)) {
             $filters = array_keys($filterManager->getFilterConfiguration()->all());

diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
@@ -78,7 +78,7 @@ public function filterAction(Request $request, $path, $filter)
     {
         // decoding special characters and whitespaces from path obtained from url
         $path = urldecode($path);
-        
+
         try {
             if (!$this->cacheManager->isStored($path, $filter)) {
                 try {

diff --git a/DependencyInjection/Compiler/FiltersCompilerPass.php b/DependencyInjection/Compiler/FiltersCompilerPass.php
@@ -9,7 +9,7 @@
 class FiltersCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/DependencyInjection/Compiler/LoadersCompilerPass.php b/DependencyInjection/Compiler/LoadersCompilerPass.php
@@ -9,7 +9,7 @@
 class LoadersCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/DependencyInjection/Compiler/PostProcessorsCompilerPass.php b/DependencyInjection/Compiler/PostProcessorsCompilerPass.php
@@ -14,7 +14,7 @@
 class PostProcessorsCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/DependencyInjection/Compiler/ResolversCompilerPass.php b/DependencyInjection/Compiler/ResolversCompilerPass.php
@@ -9,7 +9,7 @@
 class ResolversCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -31,7 +31,7 @@ public function __construct(array $resolversFactories, array $loadersFactories)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getConfigTreeBuilder()
     {

diff --git a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
@@ -9,7 +9,7 @@
 class FileSystemLoaderFactory implements LoaderFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
@@ -26,15 +26,15 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
         return 'filesystem';
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {

diff --git a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php
@@ -9,7 +9,7 @@
 class StreamLoaderFactory implements LoaderFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
@@ -27,15 +27,15 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
         return 'stream';
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {

diff --git a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
@@ -11,7 +11,7 @@
 class AwsS3ResolverFactory implements ResolverFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
@@ -72,15 +72,15 @@ public function create(ContainerBuilder $container, $resolverName, array $config
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
         return 'aws_s3';
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {

diff --git a/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php b/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php
@@ -9,7 +9,7 @@
 class WebPathResolverFactory implements ResolverFactoryInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
@@ -27,15 +27,15 @@ public function create(ContainerBuilder $container, $resolverName, array $config
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getName()
     {
         return 'web_path';
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {

diff --git a/Exception/Imagine/Filter/NonExistingFilterException.php b/Exception/Imagine/Filter/NonExistingFilterException.php
@@ -6,5 +6,4 @@
 
 class NonExistingFilterException extends \RuntimeException implements ExceptionInterface
 {
-
 }
diff --git a/Form/Type/ImageType.php b/Form/Type/ImageType.php
@@ -20,12 +20,12 @@ class ImageType extends AbstractType
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['image_path']   = $options['image_path'];
+        $view->vars['image_path'] = $options['image_path'];
         $view->vars['image_filter'] = $options['image_filter'];
-        $view->vars['image_attr']   = $options['image_attr'];
-        $view->vars['link_url']     = $options['link_url'];
-        $view->vars['link_filter']  = $options['link_filter'];
-        $view->vars['link_attr']    = $options['link_attr'];
+        $view->vars['image_attr'] = $options['image_attr'];
+        $view->vars['link_url'] = $options['link_url'];
+        $view->vars['link_filter'] = $options['link_filter'];
+        $view->vars['link_attr'] = $options['link_attr'];
     }
 
     /**

diff --git a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php
@@ -43,7 +43,7 @@ abstract class AbstractFilesystemResolver implements ResolverInterface, CacheMan
      */
     public function __construct(Filesystem $filesystem)
     {
-        $this->filesystem   = $filesystem;
+        $this->filesystem = $filesystem;
     }
 
     /**
@@ -81,15 +81,15 @@ public function setFolderPermissions($folderPermissions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isStored($path, $filter)
     {
         return file_exists($this->getFilePath($path, $filter));
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function store(BinaryInterface $binary, $path, $filter)
     {
@@ -103,7 +103,7 @@ public function store(BinaryInterface $binary, $path, $filter)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function remove(array $paths, array $filters)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ public function __construct( @@
         }
         /**
-         * {@inheritDoc}
+         * {@inheritdoc}
          */
         public function find($path)
         {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,4 @@

		class NonExistingFilterException extends \RuntimeException implements ExceptionInterface
		{

		}