From 4a2c49fdd5bcab8abde6d40431c25de0b77b8837 Mon Sep 17 00:00:00 2001 From: umpirsky Date: Sun, 25 Oct 2015 20:45:13 +0100 Subject: [PATCH 1/5] Update dependencies --- .gitignore | 2 + composer.json | 18 +- composer.lock | 849 -------------------------------------------------- 3 files changed, 13 insertions(+), 856 deletions(-) delete mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 5556efb..4a0f0b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +bin vendor phpunit.xml +composer.lock diff --git a/composer.json b/composer.json index 867b790..5cbad70 100644 --- a/composer.json +++ b/composer.json @@ -13,17 +13,21 @@ "php": ">=5.3.3", "twig/twig": "~1.2", "twig/extensions": "~1.0", - "symfony/twig-bridge": "~2.0", - "symfony/routing": "~2.0", - "symfony/filesystem": "~2.0", - "symfony/translation": "~2.0", - "symfony/form": "~2.0" + "symfony/twig-bridge": "~2.7", + "symfony/routing": "~2.7", + "symfony/filesystem": "~2.7", + "symfony/translation": "~2.7", + "symfony/form": "~2.7" }, "require-dev": { - "symfony/config": "2.1.*" + "symfony/config": "~2.7", + "phpunit/phpunit": "~4.8" }, "autoload": { "psr-0": { "Twig\\Gettext": "." } }, - "bin": ["twig-gettext-extractor"] + "bin": ["twig-gettext-extractor"], + "config": { + "bin-dir": "bin" + } } diff --git a/composer.lock b/composer.lock deleted file mode 100644 index bc0310e..0000000 --- a/composer.lock +++ /dev/null @@ -1,849 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "hash": "d4511c250d879072b75c9e0a428d6d3c", - "packages": [ - { - "name": "symfony/event-dispatcher", - "version": "v2.6.4", - "target-dir": "Symfony/Component/EventDispatcher", - "source": { - "type": "git", - "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f75989f3ab2743a82fe0b03ded2598a2b1546813", - "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/stopwatch": "~2.3" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\EventDispatcher\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com", - "time": "2015-02-01 16:10:57" - }, - { - "name": "symfony/filesystem", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Filesystem", - "source": { - "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7", - "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Filesystem\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "2015-01-03 21:13:09" - }, - { - "name": "symfony/form", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Form", - "source": { - "type": "git", - "url": "https://github.com/symfony/Form.git", - "reference": "4158baad5dca9cdea1b10a721ee2d8ea0233cbee" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Form/zipball/4158baad5dca9cdea1b10a721ee2d8ea0233cbee", - "reference": "4158baad5dca9cdea1b10a721ee2d8ea0233cbee", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1", - "symfony/intl": "~2.3", - "symfony/options-resolver": "~2.6", - "symfony/property-access": "~2.3" - }, - "require-dev": { - "doctrine/collections": "~1.0", - "symfony/http-foundation": "~2.2", - "symfony/http-kernel": "~2.4", - "symfony/security-csrf": "~2.4", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/validator": "~2.6" - }, - "suggest": { - "symfony/framework-bundle": "For templating with PHP.", - "symfony/security-csrf": "For protecting forms against CSRF attacks.", - "symfony/twig-bridge": "For templating with Twig.", - "symfony/validator": "For form validation." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Form\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Form Component", - "homepage": "http://symfony.com", - "time": "2015-01-25 03:35:46" - }, - { - "name": "symfony/intl", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Intl", - "source": { - "type": "git", - "url": "https://github.com/symfony/Intl.git", - "reference": "59b04458fa72b260f3bd3d889a8fcd7d330a9cf9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Intl/zipball/59b04458fa72b260f3bd3d889a8fcd7d330a9cf9", - "reference": "59b04458fa72b260f3bd3d889a8fcd7d330a9cf9", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "symfony/filesystem": ">=2.1" - }, - "suggest": { - "ext-intl": "to use the component with locales other than \"en\"" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Intl\\": "" - }, - "classmap": [ - "Symfony/Component/Intl/Resources/stubs" - ], - "files": [ - "Symfony/Component/Intl/Resources/stubs/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - }, - { - "name": "Eriksen Costa", - "email": "eriksen.costa@infranology.com.br" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - } - ], - "description": "A PHP replacement layer for the C intl extension that includes additional data from the ICU library.", - "homepage": "http://symfony.com", - "keywords": [ - "i18n", - "icu", - "internationalization", - "intl", - "l10n", - "localization" - ], - "time": "2015-01-25 04:39:26" - }, - { - "name": "symfony/options-resolver", - "version": "v2.6.4", - "target-dir": "Symfony/Component/OptionsResolver", - "source": { - "type": "git", - "url": "https://github.com/symfony/OptionsResolver.git", - "reference": "ae68b6c97d26edcdf65eb3c2dd2aee502573e0ec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/ae68b6c97d26edcdf65eb3c2dd2aee502573e0ec", - "reference": "ae68b6c97d26edcdf65eb3c2dd2aee502573e0ec", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\OptionsResolver\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony OptionsResolver Component", - "homepage": "http://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "time": "2015-01-08 13:00:41" - }, - { - "name": "symfony/property-access", - "version": "v2.6.4", - "target-dir": "Symfony/Component/PropertyAccess", - "source": { - "type": "git", - "url": "https://github.com/symfony/PropertyAccess.git", - "reference": "9c0b67ea9c1a2b59cc7afae9177cd3c5ca5ac608" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/9c0b67ea9c1a2b59cc7afae9177cd3c5ca5ac608", - "reference": "9c0b67ea9c1a2b59cc7afae9177cd3c5ca5ac608", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\PropertyAccess\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony PropertyAccess Component", - "homepage": "http://symfony.com", - "keywords": [ - "access", - "array", - "extraction", - "index", - "injection", - "object", - "property", - "property path", - "reflection" - ], - "time": "2015-01-25 04:39:26" - }, - { - "name": "symfony/routing", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Routing", - "source": { - "type": "git", - "url": "https://github.com/symfony/Routing.git", - "reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/bda1c3c67f2a33bbeabb1d321feaf626a0ca5698", - "reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", - "psr/log": "~1.0", - "symfony/config": "~2.2", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" - }, - "suggest": { - "doctrine/annotations": "For using the annotation loader", - "symfony/config": "For using the all-in-one router or any loader", - "symfony/expression-language": "For using expression matching", - "symfony/yaml": "For using the YAML loader" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Routing\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Routing Component", - "homepage": "http://symfony.com", - "keywords": [ - "router", - "routing", - "uri", - "url" - ], - "time": "2015-01-15 12:15:12" - }, - { - "name": "symfony/security-core", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Security/Core", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-core.git", - "reference": "4603bcc66e20e23f018c67f7f9f3f8146a100c11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/4603bcc66e20e23f018c67f7f9f3f8146a100c11", - "reference": "4603bcc66e20e23f018c67f7f9f3f8146a100c11", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "ircmaxell/password-compat": "1.0.*", - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/expression-language": "~2.6", - "symfony/http-foundation": "~2.4", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/validator": "~2.5,>=2.5.5" - }, - "suggest": { - "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5", - "symfony/event-dispatcher": "", - "symfony/expression-language": "For using the expression voter", - "symfony/http-foundation": "", - "symfony/validator": "For using the user password constraint" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Security\\Core\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Security Component - Core Library", - "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:26" - }, - { - "name": "symfony/security-csrf", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Security/Csrf", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-csrf.git", - "reference": "c532081e1c9295b69dac2e3faea87112543504fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/c532081e1c9295b69dac2e3faea87112543504fc", - "reference": "c532081e1c9295b69dac2e3faea87112543504fc", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/security-core": "~2.4" - }, - "require-dev": { - "symfony/http-foundation": "~2.1" - }, - "suggest": { - "symfony/http-foundation": "For using the class SessionTokenStorage." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Security\\Csrf\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Security Component - CSRF Library", - "homepage": "http://symfony.com", - "time": "2015-01-03 08:01:59" - }, - { - "name": "symfony/translation", - "version": "v2.6.4", - "target-dir": "Symfony/Component/Translation", - "source": { - "type": "git", - "url": "https://github.com/symfony/Translation.git", - "reference": "f289cdf8179d32058c1e1cbac723106a5ff6fa39" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/f289cdf8179d32058c1e1cbac723106a5ff6fa39", - "reference": "f289cdf8179d32058c1e1cbac723106a5ff6fa39", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.3,>=2.3.12", - "symfony/intl": "~2.3", - "symfony/yaml": "~2.2" - }, - "suggest": { - "psr/log": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Translation\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Translation Component", - "homepage": "http://symfony.com", - "time": "2015-01-03 15:33:07" - }, - { - "name": "symfony/twig-bridge", - "version": "v2.6.4", - "target-dir": "Symfony/Bridge/Twig", - "source": { - "type": "git", - "url": "https://github.com/symfony/TwigBridge.git", - "reference": "85572fed6e76dd1794d12ac8c1dd9ffa6882d45d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/85572fed6e76dd1794d12ac8c1dd9ffa6882d45d", - "reference": "85572fed6e76dd1794d12ac8c1dd9ffa6882d45d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/security-csrf": "~2.4", - "twig/twig": "~1.13,>=1.13.1" - }, - "require-dev": { - "symfony/console": "~2.4", - "symfony/expression-language": "~2.4", - "symfony/finder": "~2.3", - "symfony/form": "~2.6", - "symfony/http-kernel": "~2.3", - "symfony/intl": "~2.3", - "symfony/routing": "~2.2", - "symfony/security": "~2.4", - "symfony/stopwatch": "~2.2", - "symfony/templating": "~2.1", - "symfony/translation": "~2.2", - "symfony/var-dumper": "~2.6", - "symfony/yaml": "~2.0,>=2.0.5" - }, - "suggest": { - "symfony/expression-language": "For using the ExpressionExtension", - "symfony/finder": "", - "symfony/form": "For using the FormExtension", - "symfony/http-kernel": "For using the HttpKernelExtension", - "symfony/routing": "For using the RoutingExtension", - "symfony/security": "For using the SecurityExtension", - "symfony/stopwatch": "For using the StopwatchExtension", - "symfony/templating": "For using the TwigEngine", - "symfony/translation": "For using the TranslationExtension", - "symfony/var-dumper": "For using the DumpExtension", - "symfony/yaml": "For using the YamlExtension" - }, - "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Bridge\\Twig\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Twig Bridge", - "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:26" - }, - { - "name": "twig/extensions", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", - "shasum": "" - }, - "require": { - "twig/twig": "~1.12" - }, - "require-dev": { - "symfony/translation": "~2.3" - }, - "suggest": { - "symfony/translation": "Allow the time_diff output to be translated" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-0": { - "Twig_Extensions_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Common additional features for Twig that do not directly belong in core", - "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html", - "keywords": [ - "i18n", - "text" - ], - "time": "2014-10-30 14:30:03" - }, - { - "name": "twig/twig", - "version": "v1.18.0", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - } - }, - "autoload": { - "psr-0": { - "Twig_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" - }, - { - "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", - "role": "Contributors" - } - ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", - "keywords": [ - "templating" - ], - "time": "2015-01-25 17:32:08" - } - ], - "packages-dev": [ - { - "name": "symfony/config", - "version": "v2.1.13", - "target-dir": "Symfony/Component/Config", - "source": { - "type": "git", - "url": "https://github.com/symfony/Config.git", - "reference": "51909bf7f5d763d125a67781942d9293f65afae7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/51909bf7f5d763d125a67781942d9293f65afae7", - "reference": "51909bf7f5d763d125a67781942d9293f65afae7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Config": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Config Component", - "homepage": "http://symfony.com", - "time": "2013-05-09 15:22:40" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">=5.3.3" - }, - "platform-dev": [] -} From b9735d35a59250f13f29de05dc28c5285b5b3d0d Mon Sep 17 00:00:00 2001 From: umpirsky Date: Sun, 25 Oct 2015 20:45:26 +0100 Subject: [PATCH 2/5] Test on newer versions of PHP --- .travis.yml | 4 +++- LICENSE | 2 +- README.md | 12 ------------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c9bce0..9a531de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,6 @@ before_script: php: - 5.3 - 5.4 - + - 5.5 + - 5.6 + - 7.0 diff --git a/LICENSE b/LICENSE index df9dd10..3592e93 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) Саша Стаменковић +Copyright (c) Saša Stamenković Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 50249fd..f2eadea 100644 --- a/README.md +++ b/README.md @@ -46,15 +46,3 @@ Now you may add your custom extensions [here](https://github.com/umpirsky/Twig-G $twig->addFunction(new \Twig_SimpleFunction('myCustomExtension', true)); $twig->addFunction(new \Twig_SimpleFunction('myCustomExtension2', true)); ``` - -## Tests - -To run the test suite, you need [composer](http://getcomposer.org) and -[PHPUnit](https://github.com/sebastianbergmann/phpunit). - - $ composer install --dev - $ phpunit - -## License - -Twig Gettext Extractor is licensed under the MIT license. From f14062345633badec522e47f5e1541a3c13ca396 Mon Sep 17 00:00:00 2001 From: umpirsky Date: Sun, 25 Oct 2015 20:51:20 +0100 Subject: [PATCH 3/5] Make my name human readable --- Twig/Gettext/Extractor.php | 4 ++-- Twig/Gettext/Loader/Filesystem.php | 4 ++-- Twig/Gettext/Routing/Generator/UrlGenerator.php | 4 ++-- Twig/Gettext/Test/ExtractorTest.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Twig/Gettext/Extractor.php b/Twig/Gettext/Extractor.php index e7fa1af..1866a8c 100644 --- a/Twig/Gettext/Extractor.php +++ b/Twig/Gettext/Extractor.php @@ -3,7 +3,7 @@ /** * This file is part of the Twig Gettext utility. * - * (c) Саша Стаменковић + * (c) Saša Stamenković * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -16,7 +16,7 @@ /** * Extracts translations from twig templates. * - * @author Саша Стаменковић + * @author Saša Stamenković */ class Extractor { diff --git a/Twig/Gettext/Loader/Filesystem.php b/Twig/Gettext/Loader/Filesystem.php index b011b03..58743ea 100644 --- a/Twig/Gettext/Loader/Filesystem.php +++ b/Twig/Gettext/Loader/Filesystem.php @@ -3,7 +3,7 @@ /** * This file is part of the Twig Gettext utility. * - * (c) Саша Стаменковић + * (c) Saša Stamenković * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -14,7 +14,7 @@ /** * Loads template from the filesystem. * - * @author Саша Стаменковић + * @author Saša Stamenković */ class Filesystem extends \Twig_Loader_Filesystem { diff --git a/Twig/Gettext/Routing/Generator/UrlGenerator.php b/Twig/Gettext/Routing/Generator/UrlGenerator.php index 9e3431b..e2635ce 100644 --- a/Twig/Gettext/Routing/Generator/UrlGenerator.php +++ b/Twig/Gettext/Routing/Generator/UrlGenerator.php @@ -3,7 +3,7 @@ /** * This file is part of the Twig Gettext utility. * - * (c) Саша Стаменковић + * (c) Saša Stamenković * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -17,7 +17,7 @@ /** * Dummy url generator. * - * @author Саша Стаменковић + * @author Saša Stamenković */ class UrlGenerator implements UrlGeneratorInterface { diff --git a/Twig/Gettext/Test/ExtractorTest.php b/Twig/Gettext/Test/ExtractorTest.php index d467835..ab12995 100644 --- a/Twig/Gettext/Test/ExtractorTest.php +++ b/Twig/Gettext/Test/ExtractorTest.php @@ -3,7 +3,7 @@ /** * This file is part of the Twig Gettext utility. * - * (c) Саша Стаменковић + * (c) Saša Stamenković * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -16,7 +16,7 @@ use Symfony\Component\Translation\Loader\PoFileLoader; /** - * @author Саша Стаменковић + * @author Saša Stamenković */ class ExtractorTest extends \PHPUnit_Framework_TestCase { From f671861aac676e503b498ff636041302f47a647d Mon Sep 17 00:00:00 2001 From: umpirsky Date: Sun, 25 Oct 2015 20:52:01 +0100 Subject: [PATCH 4/5] CS fixes --- Twig/Gettext/Extractor.php | 4 ++-- Twig/Gettext/Test/ExtractorTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Twig/Gettext/Extractor.php b/Twig/Gettext/Extractor.php index 1866a8c..2a2de24 100644 --- a/Twig/Gettext/Extractor.php +++ b/Twig/Gettext/Extractor.php @@ -70,8 +70,8 @@ public function setGettextParameters(array $parameters) public function extract() { $command = 'xgettext'; - $command .= ' '.join(' ', $this->parameters); - $command .= ' '.join(' ', $this->templates); + $command .= ' '.implode(' ', $this->parameters); + $command .= ' '.implode(' ', $this->templates); $error = 0; $output = system($command, $error); diff --git a/Twig/Gettext/Test/ExtractorTest.php b/Twig/Gettext/Test/ExtractorTest.php index ab12995..151fa9b 100644 --- a/Twig/Gettext/Test/ExtractorTest.php +++ b/Twig/Gettext/Test/ExtractorTest.php @@ -33,8 +33,8 @@ class ExtractorTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->twig = new \Twig_Environment(new Filesystem('/'), array( - 'cache' => '/tmp/cache/'.uniqid(), - 'auto_reload' => true + 'cache' => '/tmp/cache/'.uniqid(), + 'auto_reload' => true, )); $this->twig->addExtension(new \Twig_Extensions_Extension_I18n()); From b52504fd48dcab3d3ea26803823eac0b42429b52 Mon Sep 17 00:00:00 2001 From: umpirsky Date: Sun, 25 Oct 2015 20:53:47 +0100 Subject: [PATCH 5/5] Updated travis config --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a531de..4797f55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,15 @@ language: php -before_script: - - curl -s http://getcomposer.org/installer | php - - php composer.phar install --dev - php: - 5.3 - 5.4 - 5.5 - 5.6 - 7.0 + - hhvm + +before_script: + - composer install --dev + +script: + - phpunit