Better travis config (#24)

* Better travis config

* Code cleanup

* Bugfixes

* Updated dev requirements

* Applied changes from StyleCI

Author: Nyholm

.travis.yml

@@ -9,45 +9,56 @@ branches:
     - /^analysis-.*$/
     - /^patch-.*$/
 
-php:
-    - 5.5
-    - 5.6
-    - 7.0
-    - 7.1
-
 env:
   global:
     - TEST_COMMAND="composer test"
-  matrix:
-    - SYMFONY_VERSION=3.3.*
-    - SYMFONY_VERSION=2.7.*
 
 matrix:
-  fast_finish: true
-  include:
-    - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.8.*
-    - php: hhvm
-      dist: trusty
-      env: SYMFONY_VERSION=2.8.*
-    - php: 7.0
-      env: SYMFONY_VERSION=2.8.*
-    - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
-    - php: 7.1
-      env: SYMFONY_VERSION=4.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.1.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.2.*
+    fast_finish: true
+    include:
+          # Test with lowest dependencies
+        - php: 7.1
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+        - php: 5.5
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+
+          # Test the latest stable release
+        - php: 5.5
+        - php: 5.6
+        - php: 7.0
+        - php: 7.1
+        - php: 7.2
+          env: COVERAGE=true TEST_COMMAND="composer test-ci"
+
+          # Force some major versions of Symfony
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^2"
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^3"
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^4"
+
+          # Latest commit to master
+        - php: 7.2
+          env: STABILITY="dev"
+
+    allow_failures:
+          # Dev-master is allowed to fail.
+        - env: STABILITY="dev"
+
+before_install:
+    - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
+    - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
+    - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
 
 install:
-    - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
-    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
+    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
+    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - vendor/bin/simple-phpunit install
 
 script:
+    - composer validate --strict --no-check-lock
     - $TEST_COMMAND
 
 after_success:

composer.json

@@ -15,8 +15,8 @@
         "nyholm/nsa": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.5 || ^6.2",
-        "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0"
+        "symfony/phpunit-bridge": "^3.4 || ^4.0",
+        "symfony/framework-bundle": "^2.7.39 || ^3.0 || ^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -29,10 +29,9 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+        "test": "vendor/bin/simple-phpunit",
+        "test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
     },
-    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.3-dev"

src/FileStorage.php

@@ -11,11 +11,9 @@
 
 namespace Translation\SymfonyStorage;
 
-use Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader as SymfonyTranslationLoader;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\MessageCatalogueInterface;
-use Symfony\Component\Translation\Reader\TranslationReader;
-use Symfony\Component\Translation\Writer\TranslationWriter;
+use Symfony\Component\Translation\Reader\TranslationReaderInterface;
 use Symfony\Component\Translation\Writer\TranslationWriterInterface;
 use Translation\Common\Model\Message;
 use Translation\Common\Storage;
@@ -29,14 +27,14 @@
 final class FileStorage implements Storage, TransferableStorage
 {
     /**
-     * @var TranslationWriterInterface|LegacyTranslationWriter
+     * @var TranslationWriterInterface
      */
     private $writer;
 
     /**
-     * @var TranslationLoader|SymfonyTranslationLoader
+     * @var TranslationReaderInterface
      */
-    private $loader;
+    private $reader;
 
     /**
      * @var array directory path
@@ -49,28 +47,26 @@ final class FileStorage implements Storage, TransferableStorage
     private $options;
 
     /**
-     * @var MessageCatalogue[] Fetched catalogies
+     * @var MessageCatalogue[] Fetched catalogues
      */
     private $catalogues;
 
     /**
-     * @param TranslationWriter                                            $writer
-     * @param SymfonyTranslationLoader|TranslationLoader|TranslationReader $loader
-     * @param array                                                        $dir
-     * @param array                                                        $options
+     * @param TranslationWriterInterface $writer
+     * @param TranslationReaderInterface $reader
+     * @param array                      $dir
+     * @param array                      $options
      */
-    public function __construct(TranslationWriter $writer, $loader, array $dir, array $options = [])
+    public function __construct($writer, $reader, array $dir, array $options = [])
     {
-        // Create a legacy writer which is a wrapper for TranslationWriter
+        // Create a wrapper for legacy writer
         if (!$writer instanceof TranslationWriterInterface) {
             $writer = new LegacyTranslationWriter($writer);
         }
-        // Create a legacy loader which is a wrapper for TranslationReader
-        if ($loader instanceof TranslationReader) {
-            $loader = new LegacyTranslationLoader($loader);
-        }
-        if (!$loader instanceof SymfonyTranslationLoader && !$loader instanceof TranslationLoader) {
-            throw new \LogicException('Second parameter of FileStorage must be a Symfony translation loader or implement Translation\SymfonyStorage\TranslationLoader');
+
+        // Create a wrapper for legacy reader
+        if (!$reader instanceof TranslationReaderInterface) {
+            $reader = new LegacyTranslationReader($reader);
         }
 
         if (empty($dir)) {
@@ -83,7 +79,7 @@ public function __construct(TranslationWriter $writer, $loader, array $dir, arra
         }
 
         $this->writer = $writer;
-        $this->loader = $loader;
+        $this->reader = $reader;
         $this->dir = $dir;
         $this->options = $options;
     }
@@ -157,10 +153,10 @@ public function import(MessageCatalogueInterface $catalogue)
     /**
      * Save catalogue back to file.
      *
-     * @param MessageCatalogue $catalogue
-     * @param string           $domain
+     * @param MessageCatalogueInterface $catalogue
+     * @param string                    $domain
      */
-    private function writeCatalogue(MessageCatalogue $catalogue, $locale, $domain)
+    private function writeCatalogue(MessageCatalogueInterface $catalogue, $locale, $domain)
     {
         $resources = $catalogue->getResources();
         $options = $this->options;
@@ -209,7 +205,7 @@ private function loadCatalogue($locale, array $dirs)
         $currentCatalogue = new MessageCatalogue($locale);
         foreach ($dirs as $path) {
             if (is_dir($path)) {
-                $this->loader->loadMessages($path, $currentCatalogue);
+                $this->reader->read($path, $currentCatalogue);
             }
         }
 

src/LegacyTranslationLoader.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the PHP Translation package.
+ *
+ * (c) PHP Translation team <tobias.nyholm@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Translation\SymfonyStorage;
+
+use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader;
+
+/**
+ * This loader is just a wrapper for Symfony TranslationLoader
+ * and provide a BC layer for Symfony 2.7 to 3.3.
+ *
+ * @author Victor Bocharsky <bocharsky.bw@gmail.com>
+ */
+final class LegacyTranslationReader // implements Symfony\Component\Translation\Reader\TranslationReaderInterface
+{
+    /**
+     * @var TranslationLoader
+     */
+    private $loader;
+
+    public function __construct($loader)
+    {
+        if (!$loader instanceof TranslationLoader) {
+            throw new \LogicException(sprintf('PHP-Translation/SymfonyStorage does not support a TranslationReader of type "%s".', get_class($loader)));
+        }
+        $this->loader = $loader;
+    }
+
+    public function read($directory, MessageCatalogue $catalogue)
+    {
+        $this->loader->loadMessages($directory, $catalogue);
+    }
+}

src/LegacyTranslationReader.php

@@ -15,20 +15,22 @@
 use Symfony\Component\Translation\Writer\TranslationWriter;
 
 /**
- * This writer is just a legacy wrapper for Symfony TranslationWriter
- * and provide a BC layer for Symfony 4.
+ * This writer is just a wrapper for Symfony TranslationWriter
+ * and provide a BC layer for Symfony 2.7 to 3.3.
  *
  * @author Victor Bocharsky <bocharsky.bw@gmail.com>
  */
-class LegacyTranslationWriter
+final class LegacyTranslationWriter // implements Symfony\Component\Translation\Writer\TranslationWriterInterface
 {
-    /**
-     * @var TranslationWriter
-     */
     private $writer;
 
-    public function __construct(TranslationWriter $writer)
+    public function __construct($writer)
     {
+        // If not Translation writer from sf 2.7 to 3.3
+        if (!$writer instanceof TranslationWriter) {
+            throw new \LogicException(sprintf('PHP-Translation/SymfonyStorage does not support a TranslationWriter of type "%s".', get_class($writer)));
+        }
+
         $this->writer = $writer;
     }