Remove deprecated and legacy code, migrate some syntax, cleanup

.gitattributes

@@ -1,5 +1,5 @@
 * text=auto
-/.composer/ export-ignore
+/.travis/ export-ignore
 /.github/ export-ignore
 /Tests/ export-ignore
 /.coveralls.yml export-ignore

.travis.yml

@@ -4,33 +4,21 @@ sudo: false
 
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
-
 cache:
   directories:
     - $HOME/.composer/cache/files
 
 env:
   global:
-    - SYMFONY_VERSION=2.8.x
     - SYMFONY_DEPRECATIONS_HELPER=weak
 
 matrix:
   include:
-    - php: 5.3
-      env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.x-dev
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.x-dev
-    - php: 7.1
+    - php:  hhvm-stable
+      sudo: required
+      dist: trusty
+      env:  SYMFONY_VERSION=3.0.x-dev
+    - php: 7.0
       env: SYMFONY_VERSION=3.0.x-dev
     - php: 7.1
       env: SYMFONY_VERSION=3.1.x-dev
@@ -41,28 +29,20 @@ matrix:
     - php: 7.1
       env: SYMFONY_VERSION=dev-master
   allow_failures:
-    - php: 7.1
-      env: SYMFONY_VERSION=3.3.x-dev
-    - php: 7.1
-      env: SYMFONY_VERSION=dev-master
+    - php: hhvm-stable
+    - env: SYMFONY_VERSION=dev-master
+  fast_finish: true
 
 before_install:
-  - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
-  - cp ./.composer/config.json ~/.composer; composer global require "hirak/prestissimo:^0.3"
-  - if [ "${TRAVIS_PHP_VERSION}" == "5.3" ]; then composer remove --no-update --dev satooshi/php-coveralls; fi;
-  - if [ "${SYMFONY_VERSION:0:3}" == "2.3" ]; then composer remove --no-update --dev friendsofphp/php-cs-fixer; fi;
-  - if [ "${SYMFONY_VERSION:-x}" != "x" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-  - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ] && [ "${TRAVIS_PHP_VERSION:0:3}" != "5.3" ]; then composer require --no-update --dev league/flysystem:~1.0; fi;
-  - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ] && [ "${TRAVIS_PHP_VERSION:0:1}" != "7" ]; then yes "" | pecl -q install -f mongo; composer require --no-update --dev doctrine/mongodb-odm:~1.0; fi;
-  - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ] && [ "${TRAVIS_PHP_VERSION:0:1}" == "7" ]; then yes "" | pecl -q install -f mongodb; travis_retry composer require --dev alcaeus/mongo-php-adapter:~1.0; composer require --no-update --dev doctrine/mongodb-odm:~1.0; fi
+  - bash ./.travis/exec-before.bash
 
 install:
-  - travis_retry composer update $COMPOSER_FLAGS
+  - travis_retry composer require "symfony/symfony:${SYMFONY_VERSION}" $COMPOSER_FLAGS
 
 script:
   - bin/simple-phpunit -vvv || bin/phpunit -vvv
 
 after_script:
-  - if [ "${TRAVIS_PHP_VERSION}" != "5.3" ]; then bin/coveralls -vvv; fi;
+  - bash ./.travis/exec-after.bash
 
 ...

.travis/exec-after.bash

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# exit if any statement returns a non-true value
+set -e
+
+# determine path to this script
+readonly SELF_DIR_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/"
+
+# source variables and functions files
+source "${SELF_DIR_PATH}inc-variables.bash"
+source "${SELF_DIR_PATH}inc-functions.bash"
+
+#
+# perform different operations depending on the environment
+#
+function main()
+{
+  out_main "Running 'exec-after' operations"
+
+  send_coveralls_statistics
+}
+
+# go!
+main

.travis/exec-before.bash

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# exit if any statement returns a non-true value
+set -e
+
+# determine path to this script
+readonly SELF_DIR_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/"
+
+# source variables and functions files
+source "${SELF_DIR_PATH}inc-variables.bash"
+source "${SELF_DIR_PATH}inc-functions.bash"
+
+#
+# perform different operations depending on the environment
+#
+function main()
+{
+  out_main "Running 'exec-before' operations"
+
+  if [[ ! ${TRAVIS_PHP_VERSION} = hhvm* ]]; then
+    disable_php_memory_limit
+  fi
+
+  if [[ ${TRAVIS_PHP_VERSION} = hhvm* ]]; then
+    enable_hhvm_php7_mode
+  fi
+
+  initialize_prestissimo
+}
+
+# go!
+main

.travis/inc-functions.bash

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+#
+# output text to console
+#
+function out_line()
+{
+  printf "[%d] %s...\n" $(date +%s) "${1}"
+}
+
+#
+# output main text to console
+#
+function out_main()
+{
+  out_line "${1^^}"
+}
+
+#
+# disable the php memory limit by setting it to "-1"
+#
+function disable_php_memory_limit()
+{
+  if [[ ! -d "$(dirname ${CONF_PATH_PHP7})" ]]; then
+    return
+  fi
+
+  out_line "Disabling PHP memory limit in '${CONF_PATH_PHP7}'"
+  echo "memory_limit = -1" >> "${CONF_PATH_PHP7}";
+}
+
+#
+# enable the hhvm php7 mode by setting it to "1"
+#
+function enable_hhvm_php7_mode()
+{
+  out_line "Enabling HHVM PHP7 mode in '${CONF_PATH_HHVM}'"
+  echo "hhvm.php7.all = 1" >> "${CONF_PATH_HHVM}"
+  echo "hhvm.php7.scalar_types = 0" >> "${CONF_PATH_HHVM}"
+}
+
+#
+# configure the prestissimo package
+#
+function configure_prestissimo()
+{
+  local composer_reqs="${1}"
+  local composer_orig="${TRAVIS_BUILD_DIR}/.travis/composer/config.json"
+  local composer_dest="${HOME}/.composer/config.json"
+
+  out_line "Configuring '${composer_reqs}' in '${composer_dest}'"
+  if [[ ! -d "$(dirname ${composer_dest})" ]]; then
+    mkdir "$(dirname ${composer_dest})"
+  fi
+  cp "${composer_orig}" "${composer_dest}"
+}
+
+#
+# require the prestissimo package using composer
+#
+function require_prestissimo()
+{
+  local composer_reqs="${1}"
+
+  out_line "Requiring '${composer_reqs}'"
+  composer global require "${composer_reqs}"
+}
+
+#
+# initialize the prestissimo package
+#
+function initialize_prestissimo()
+{
+  local composer_reqs="hirak/prestissimo:^0.3"
+
+  configure_prestissimo "${composer_reqs}"
+  require_prestissimo "${composer_reqs}"
+}
+
+#
+# send coveralls statistics using the required binary
+#
+function send_coveralls_statistics()
+{
+  local coveralls_bin="${TRAVIS_BUILD_DIR}/bin/coveralls"
+
+  out_line "Sending Coveralls coverage using '${coveralls_bin}'"
+  ${coveralls_bin} -vvv
+}

.travis/inc-variables.bash

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# path to travis php configuration file
+CONF_PATH_PHP7="${HOME}/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini"
+CONF_PATH_HHVM="/etc/hhvm/php.ini"

Binary/Loader/FileSystemLoader.php

@@ -38,30 +38,19 @@ class FileSystemLoader implements LoaderInterface
     /**
      * @param MimeTypeGuesserInterface  $mimeGuesser
      * @param ExtensionGuesserInterface $extensionGuesser
-     * @param string[]                  $dataRoots
      * @param LocatorInterface          $locator
+     * @param string[]                  $rootPaths
      */
     public function __construct(
         MimeTypeGuesserInterface $mimeGuesser,
         ExtensionGuesserInterface $extensionGuesser,
-        $dataRoots
-        /* LocatorInterface $locator */
+        LocatorInterface $locator,
+        array $rootPaths = []
     ) {
         $this->mimeTypeGuesser = $mimeGuesser;
         $this->extensionGuesser = $extensionGuesser;
-
-        if (count($dataRoots) === 0) {
-            throw new InvalidArgumentException('One or more data root paths must be specified.');
-        }
-
-        if (func_num_args() >= 4 && false === ($this->locator = func_get_arg(3)) instanceof LocatorInterface) {
-            throw new \InvalidArgumentException(sprintf('Method %s() expects a LocatorInterface for the forth argument.', __METHOD__));
-        } elseif (func_num_args() < 4) {
-            @trigger_error(sprintf('Method %s() will have a forth `LocatorInterface $locator` argument in version 2.0. Not defining it is deprecated since version 1.7.2', __METHOD__), E_USER_DEPRECATED);
-            $this->locator = new FileSystemLocator();
-        }
-
-        $this->locator->setOptions(array('roots' => (array) $dataRoots));
+        $this->locator = $locator;
+        $this->locator->setOptions(['roots' => $rootPaths]);
     }
 
     /**

Binary/Locator/FileSystemLocator.php

@@ -21,23 +21,23 @@ class FileSystemLocator implements LocatorInterface
     /**
      * @var string[]
      */
-    private $roots = array();
+    private $roots = [];
 
     /**
      * @param array[] $options
      */
-    public function setOptions(array $options = array())
+    public function setOptions(array $options = [])
     {
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array('roots' => array()));
+        $resolver->setDefaults(['roots' => []]);
 
         try {
             $options = $resolver->resolve($options);
         } catch (ExceptionInterface $e) {
             throw new InvalidArgumentException(sprintf('Invalid options provided to %s()', __METHOD__), null, $e);
         }
 
-        $this->roots = array_map(array($this, 'sanitizeRootPath'), (array) $options['roots']);
+        $this->roots = array_map([$this, 'sanitizeRootPath'], (array) $options['roots']);
     }
 
     /**

Binary/Locator/LocatorInterface.php

@@ -16,7 +16,7 @@ interface LocatorInterface
     /**
      * @param array $options[]
      */
-    public function setOptions(array $options = array());
+    public function setOptions(array $options = []);
 
     /**
      * @param string $path

Controller/ImagineController.php

@@ -141,7 +141,7 @@ public function filterRuntimeAction(Request $request, $hash, $path, $filter)
         $resolver = $request->get('resolver');
 
         try {
-            $filters = $request->query->get('filters', array());
+            $filters = $request->query->get('filters', []);
 
             if (!is_array($filters)) {
                 throw new NotFoundHttpException(sprintf('Filters must be an array. Value was "%s"', $filters));
@@ -169,9 +169,9 @@ public function filterRuntimeAction(Request $request, $hash, $path, $filter)
             $rcPath = $this->cacheManager->getRuntimePath($path, $filters);
 
             $this->cacheManager->store(
-                $this->filterManager->applyFilter($binary, $filter, array(
+                $this->filterManager->applyFilter($binary, $filter, [
                     'filters' => $filters,
-                )),
+                ]),
                 $rcPath,
                 $filter,
                 $resolver