From d5f2ae5a81f8e7912b21efdc0046df1991ac62b1 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 18 May 2018 19:21:08 -0400 Subject: [PATCH] Reverted dependency changes to run with PHP 5.3 GitList 1.x is legacy software and there's no reason why it should not run on old versions of PHP. With the series 2.x being under development, we should strive to make this version stable and compatible with most platforms, regardless of any maintainability issues that might occur from having to support legacy ecosystems. --- .php_cs | 27 - .travis.yml | 5 +- README.md | 27 +- build.xml | 52 +- composer.json | 20 +- composer.lock | 1554 +++-------------- src/Application.php | 42 +- src/Config.php | 2 +- src/Controller/BlobController.php | 16 +- src/Controller/CommitController.php | 24 +- src/Controller/MainController.php | 16 +- src/Controller/NetworkController.php | 32 +- src/Controller/TreeController.php | 12 +- src/Controller/TreeGraphController.php | 16 +- src/Git/Client.php | 8 +- src/Git/Repository.php | 26 +- src/Provider/GitServiceProvider.php | 22 +- .../RepositoryUtilServiceProvider.php | 14 +- src/Provider/RoutingUtilServiceProvider.php | 14 +- src/Provider/ViewUtilServiceProvider.php | 12 +- src/Util/Repository.php | 16 +- src/Util/Routing.php | 2 +- src/Util/View.php | 10 +- tests/InterfaceTest.php | 4 +- themes/default/twig/footer.twig | 2 +- 25 files changed, 451 insertions(+), 1524 deletions(-) delete mode 100644 .php_cs diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 0b4c2b7..0000000 --- a/.php_cs +++ /dev/null @@ -1,27 +0,0 @@ -in(__DIR__ . '/src') - ->in(__DIR__ . '/tests'); - -return PhpCsFixer\Config::create() - ->setRules([ - '@Symfony' => true, - 'array_syntax' => ['syntax' => 'short'], - 'blank_line_after_opening_tag' => true, - 'concat_space' => ['spacing' => 'one'], - 'modernize_types_casting' => true, - 'no_multiline_whitespace_before_semicolons' => true, - 'no_useless_else' => true, - 'no_useless_return' => true, - 'ordered_class_elements' => true, - 'ordered_imports' => true, - 'phpdoc_align' => false, - 'phpdoc_order' => true, - 'php_unit_construct' => true, - 'php_unit_dedicate_assert' => true, - 'pre_increment' => false, - ]) - ->setFinder($finder) - ->setUsingCache(true) - ->setRiskyAllowed(true); diff --git a/.travis.yml b/.travis.yml index 9b43a5e..34562cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ language: php php: + - 5.3 + - 5.4 + - 5.5 + - 5.6 - 7.0 - 7.1 @@ -12,7 +16,6 @@ install: - travis_retry composer install --no-interaction --prefer-source script: - - vendor/bin/php-cs-fixer fix --dry-run -v - vendor/bin/phpunit --verbose matrix: diff --git a/README.md b/README.md index 9c770bb..9c8dd09 100644 --- a/README.md +++ b/README.md @@ -13,20 +13,16 @@ GitList is an elegant and modern web interface for interacting with multiple git * Repository statistics ## Screenshots -[![GitList Screenshot](http://dl.dropbox.com/u/62064441/th1.jpg)](http://cloud.github.com/downloads/klaussilveira/gitlist/1.jpg) -[![GitList Screenshot](http://dl.dropbox.com/u/62064441/th2.jpg)](http://cloud.github.com/downloads/klaussilveira/gitlist/2.jpg) -[![GitList Screenshot](http://dl.dropbox.com/u/62064441/th3.jpg)](http://cloud.github.com/downloads/klaussilveira/gitlist/3.jpg) -[![GitList Screenshot](http://dl.dropbox.com/u/62064441/th4.jpg)](http://cloud.github.com/downloads/klaussilveira/gitlist/4.jpg) -[![GitList Screenshot](http://dl.dropbox.com/u/62064441/th5.jpg)](http://cloud.github.com/downloads/klaussilveira/gitlist/5.jpg) - -You can also see a live demo [here](http://gitlist-khornberg.rhcloud.com/). +![Screenshot 1](https://raw.githubusercontent.com/klaussilveira/gitlist/gh-pages/img/roller/1.jpg) +![Screenshot 1](https://raw.githubusercontent.com/klaussilveira/gitlist/gh-pages/img/roller/2.jpg) +![Screenshot 1](https://raw.githubusercontent.com/klaussilveira/gitlist/gh-pages/img/roller/3.jpg) ## Requirements In order to run GitList on your server, you'll need: +* PHP 5.3+ * git -* Apache with mod_rewrite enabled or nginx -* PHP 7 +* Webserver (Apache, nginx, lighttpd) ## Installation * Download GitList from [gitlist.org](http://gitlist.org/) and decompress to your `/var/www/gitlist` folder, or anywhere else you want to place GitList. @@ -51,14 +47,8 @@ That's it, installation complete! If you're having problems, check the [Troubles ## License [New BSD license](http://www.opensource.org/licenses/bsd-license.php) -## Todo -* improve the current test code coverage -* test the interface -* submodule support -* multilanguage support - ## Development -GitList uses [Composer](http://getcomposer.org/) to manage dependencies and [Ant](http://ant.apache.org/) to build the project. In order to run all the targets in the build script, you will need [PHPUnit](http://www.phpunit.de/), [phpcpd](https://github.com/sebastianbergmann/phpcpd), [phploc](https://github.com/sebastianbergmann/phploc), [PHPMD](http://phpmd.org/) and [PHP_Depend](http://pdepend.org). +GitList uses [Composer](http://getcomposer.org/) to manage dependencies and [Ant](http://ant.apache.org/) to build the project. Once you have all the dependencies set, you can clone the repository and run Ant: @@ -80,9 +70,8 @@ If you have Composer in your path, things get easier. But you know the drill. ## Contributing If you are a developer, we need your help. GitList is a young project and we have lots of stuff to do. Some developers are contributing with new features, others with bug fixes. But you can also dedicate yourself to refactoring the current codebase and improving what we already have. This is very important, we want GitList to be a state-of-the-art application, and we need your help for that. -* Stay tuned to possible bugs, suboptimal code, duplicated code, overcomplicated expressions and unused code with [PHPMD](http://ci.gitlist.org:8080/job/GitList%20\(master\)/9/pmdResult/?) in our CI server -* Try to fix any [violations](http://ci.gitlist.org:8080/job/GitList%20\(master\)/violations/) reported -* Improve the [test coverage](http://ci.gitlist.org:8080/job/GitList%20\(master\)/9/cloverphp-report/) by creating unit and functional tests +* Stay tuned to possible bugs, suboptimal code, duplicated code, overcomplicated expressions and unused code +* Improve the test coverage by creating unit and functional tests ## Further information If you want to know more about customizing GitList, check the [Customization](https://github.com/klaussilveira/gitlist/wiki/Customizing) page on the wiki. Also, if you're having problems with GitList, check the [Troubleshooting](https://github.com/klaussilveira/gitlist/wiki/Troubleshooting) page. Don't forget to report issues and suggest new features! :) diff --git a/build.xml b/build.xml index 46f36b2..351c9aa 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + @@ -21,7 +21,6 @@ - @@ -29,6 +28,7 @@ + @@ -46,64 +46,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/composer.json b/composer.json index e1137d0..cfb0e91 100644 --- a/composer.json +++ b/composer.json @@ -2,21 +2,19 @@ "name": "klaussilveira/gitlist", "description": "An elegant git repository viewer", "require": { - "silex/silex": "~2.2", - "twig/twig": "~2.4", - "symfony/twig-bridge": "~3.0", - "symfony/filesystem": "~3.0", + "silex/silex": "1.3.*", + "twig/twig": "1.35.*", + "symfony/process": "2.8.*", + "symfony/http-kernel": "2.8.*", + "symfony/twig-bridge": "2.8.*", + "symfony/filesystem": "2.8.*", "klaussilveira/gitter": "0.2.*" }, "require-dev": { - "symfony/browser-kit": "~3.0", - "symfony/css-selector": "~3.0", + "symfony/browser-kit": "~2.8", + "symfony/css-selector": "~2.8", "phpunit/phpunit": "~5.0", - "phpmd/phpmd": "1.5.*", - "phploc/phploc": "2.0.*", - "sebastian/phpcpd": "2.0.*", - "doctrine/annotations": "^1.4", - "friendsofphp/php-cs-fixer": "^2.5" + "doctrine/annotations": "^1.4" }, "minimum-stability": "stable", "autoload": { diff --git a/composer.lock b/composer.lock index 9481a04..b447895 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1a456967bcae5fc56ed8e997f8f8a9fd", + "content-hash": "ca123ef905cab621777f693206d8b393", "packages": [ { "name": "klaussilveira/gitter", @@ -56,34 +56,30 @@ }, { "name": "pimple/pimple", - "version": "v3.2.2", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "4d45fb62d96418396ec58ba76e6f065bca16e10a" + "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/4d45fb62d96418396ec58ba76e6f065bca16e10a", - "reference": "4d45fb62d96418396ec58ba76e6f065bca16e10a", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d", + "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/container": "^1.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { "psr-0": { - "Pimple": "src/" + "Pimple": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -96,62 +92,13 @@ "email": "fabien@symfony.com" } ], - "description": "Pimple, a simple Dependency Injection Container", + "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", "homepage": "http://pimple.sensiolabs.org", "keywords": [ "container", "dependency injection" ], - "time": "2017-07-23T07:32:15+00:00" - }, - { - "name": "psr/container", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2013-11-22T08:30:29+00:00" }, { "name": "psr/log", @@ -202,65 +149,53 @@ }, { "name": "silex/silex", - "version": "v2.2.0", + "version": "v1.3.6", "source": { "type": "git", "url": "https://github.com/silexphp/Silex.git", - "reference": "ec7d5b5334465414952d4b2e935e73bd085dbbbb" + "reference": "ff8aa6bc2e066e14b07e0c63e9bd9dd1458af136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Silex/zipball/ec7d5b5334465414952d4b2e935e73bd085dbbbb", - "reference": "ec7d5b5334465414952d4b2e935e73bd085dbbbb", + "url": "https://api.github.com/repos/silexphp/Silex/zipball/ff8aa6bc2e066e14b07e0c63e9bd9dd1458af136", + "reference": "ff8aa6bc2e066e14b07e0c63e9bd9dd1458af136", "shasum": "" }, "require": { - "php": ">=5.5.9", - "pimple/pimple": "~3.0", - "symfony/event-dispatcher": "~2.8|^3.0", - "symfony/http-foundation": "~2.8|^3.0", - "symfony/http-kernel": "~2.8|^3.0", - "symfony/routing": "~2.8|^3.0" - }, - "conflict": { - "phpunit/phpunit": "<4.8.35 || >= 5.0, <5.4.3" - }, - "replace": { - "silex/api": "self.version", - "silex/providers": "self.version" + "php": ">=5.3.9", + "pimple/pimple": "~1.0", + "symfony/event-dispatcher": "~2.3|3.0.*", + "symfony/http-foundation": "~2.3|3.0.*", + "symfony/http-kernel": "~2.3|3.0.*", + "symfony/routing": "~2.3|3.0.*" }, "require-dev": { "doctrine/dbal": "~2.2", "monolog/monolog": "^1.4.1", "swiftmailer/swiftmailer": "~5", - "symfony/asset": "~2.8|^3.0", - "symfony/browser-kit": "~2.8|^3.0", - "symfony/config": "~2.8|^3.0", - "symfony/css-selector": "~2.8|^3.0", - "symfony/debug": "~2.8|^3.0", - "symfony/doctrine-bridge": "~2.8|^3.0", - "symfony/dom-crawler": "~2.8|^3.0", - "symfony/expression-language": "~2.8|^3.0", - "symfony/finder": "~2.8|^3.0", - "symfony/form": "~2.8|^3.0", - "symfony/intl": "~2.8|^3.0", - "symfony/monolog-bridge": "~2.8|^3.0", - "symfony/options-resolver": "~2.8|^3.0", - "symfony/phpunit-bridge": "^3.2", - "symfony/process": "~2.8|^3.0", - "symfony/security": "~2.8|^3.0", - "symfony/serializer": "~2.8|^3.0", - "symfony/translation": "~2.8|^3.0", - "symfony/twig-bridge": "~2.8|^3.0", - "symfony/validator": "~2.8|^3.0", - "symfony/var-dumper": "~2.8|^3.0", - "symfony/web-link": "^3.3", + "symfony/browser-kit": "~2.3|3.0.*", + "symfony/config": "~2.3|3.0.*", + "symfony/css-selector": "~2.3|3.0.*", + "symfony/debug": "~2.3|3.0.*", + "symfony/dom-crawler": "~2.3|3.0.*", + "symfony/finder": "~2.3|3.0.*", + "symfony/form": "~2.3|3.0.*", + "symfony/intl": "~2.3|3.0.*", + "symfony/monolog-bridge": "~2.3|3.0.*", + "symfony/options-resolver": "~2.3|3.0.*", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.3|3.0.*", + "symfony/security": "~2.3|3.0.*", + "symfony/serializer": "~2.3|3.0.*", + "symfony/translation": "~2.3|3.0.*", + "symfony/twig-bridge": "~2.3|3.0.*", + "symfony/validator": "~2.3|3.0.*", "twig/twig": "~1.28|~2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -287,37 +222,37 @@ "keywords": [ "microframework" ], - "time": "2017-07-23T07:40:14+00:00" + "time": "2017-04-30T16:26:54+00:00" }, { "name": "symfony/debug", - "version": "v3.0.9", + "version": "v2.8.39", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" + "reference": "4486d2be5e068b51fece4c8551c14e709f573c8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", + "url": "https://api.github.com/repos/symfony/debug/zipball/4486d2be5e068b51fece4c8551c14e709f573c8d", + "reference": "4486d2be5e068b51fece4c8551c14e709f573c8d", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": ">=5.3.9", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/class-loader": "~2.2|~3.0.0", + "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -344,32 +279,29 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-07-30T07:22:48+00:00" + "time": "2018-04-03T05:20:27+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.6", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", "shasum": "" }, "require": { "php": ">=5.5.9" }, - "conflict": { - "symfony/dependency-injection": "<3.3" - }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", + "symfony/dependency-injection": "~2.8|~3.0", "symfony/expression-language": "~2.8|~3.0", "symfony/stopwatch": "~2.8|~3.0" }, @@ -380,7 +312,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -407,29 +339,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-09T14:53:08+00:00" + "time": "2016-07-19T10:44:15+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.6", + "version": "v2.8.39", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "427987eb4eed764c3b6e38d52a0f87989e010676" + "reference": "125403a59e4cb4e3ebf46d0162fabcde613d2b97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676", - "reference": "427987eb4eed764c3b6e38d52a0f87989e010676", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/125403a59e4cb4e3ebf46d0162fabcde613d2b97", + "reference": "125403a59e4cb4e3ebf46d0162fabcde613d2b97", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -456,20 +388,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-11T07:17:58+00:00" + "time": "2018-02-19T16:23:47+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.3.6", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031" + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49e8cd2d59a7aa9bfab19e46de680c76e500a031", - "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82", + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82", "shasum": "" }, "require": { @@ -482,7 +414,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -509,52 +441,48 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-07-21T11:04:46+00:00" + "time": "2016-07-17T13:54:30+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.3.6", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5" + "reference": "0e39ed020c6a4bfb888974414fbfe2779637a487" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db10d05f1d95e4168e638db7a81c79616f568ea5", - "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/0e39ed020c6a4bfb888974414fbfe2779637a487", + "reference": "0e39ed020c6a4bfb888974414fbfe2779637a487", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": ">=5.3.9", "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~3.3" + "symfony/debug": "~2.6,>=2.6.2", + "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0", + "symfony/http-foundation": "~2.7.15|~2.8.8|~3.0.8" }, "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.3", - "symfony/var-dumper": "<3.3", - "twig/twig": "<1.34|<2.4,>=2" + "symfony/config": "<2.7" }, "require-dev": { - "psr/cache": "~1.0", - "symfony/browser-kit": "~2.8|~3.0", - "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/css-selector": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/dom-crawler": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0", - "symfony/routing": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0", - "symfony/templating": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~3.3" + "symfony/browser-kit": "~2.3|~3.0.0", + "symfony/class-loader": "~2.1|~3.0.0", + "symfony/config": "~2.8", + "symfony/console": "~2.3|~3.0.0", + "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.8|~3.0.0", + "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/finder": "~2.0,>=2.0.5|~3.0.0", + "symfony/process": "~2.0,>=2.0.5|~3.0.0", + "symfony/routing": "~2.8|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0", + "symfony/templating": "~2.2|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/var-dumper": "~2.6|~3.0.0" }, "suggest": { "symfony/browser-kit": "", @@ -568,7 +496,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -595,20 +523,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-08-01T10:25:59+00:00" + "time": "2016-10-03T18:44:05+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.5.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -620,7 +548,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -654,29 +582,29 @@ "portable", "shim" ], - "time": "2017-06-14T15:44:48+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.3.6", + "version": "v2.8.39", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a" + "reference": "ee2c91470ff262b1a00aec27875d38594aa87629" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a", + "url": "https://api.github.com/repos/symfony/process/zipball/ee2c91470ff262b1a00aec27875d38594aa87629", + "reference": "ee2c91470ff262b1a00aec27875d38594aa87629", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -703,39 +631,36 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-13T13:05:09+00:00" + "time": "2018-04-03T05:20:27+00:00" }, { "name": "symfony/routing", - "version": "v3.3.6", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26" + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26", - "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26", + "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b", + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b", "shasum": "" }, "require": { "php": ">=5.5.9" }, "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.3", - "symfony/yaml": "<3.3" + "symfony/config": "<2.8" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", "symfony/expression-language": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", - "symfony/yaml": "~3.3" + "symfony/yaml": "~2.8|~3.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -748,7 +673,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -781,47 +706,46 @@ "uri", "url" ], - "time": "2017-07-21T17:43:13+00:00" + "time": "2016-06-29T05:40:00+00:00" }, { "name": "symfony/twig-bridge", - "version": "v3.3.6", + "version": "v2.8.39", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "eaa997f4e45a3c38323b76ff0a57f9f35ae89e5c" + "reference": "83c45099a7f108416e714a92c06604e5e1e2f76d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/eaa997f4e45a3c38323b76ff0a57f9f35ae89e5c", - "reference": "eaa997f4e45a3c38323b76ff0a57f9f35ae89e5c", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/83c45099a7f108416e714a92c06604e5e1e2f76d", + "reference": "83c45099a7f108416e714a92c06604e5e1e2f76d", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": ">=5.3.9", "twig/twig": "~1.34|~2.4" }, "conflict": { - "symfony/form": "<3.2.10|~3.3,<3.3.3" + "symfony/form": "<2.8.23" }, "require-dev": { - "fig/link-util": "^1.0", - "symfony/asset": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/form": "^3.2.10|^3.3.3", - "symfony/http-kernel": "~3.2", + "symfony/asset": "~2.7|~3.0.0", + "symfony/console": "~2.8|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/finder": "~2.3|~3.0.0", + "symfony/form": "^2.8.23", + "symfony/http-foundation": "^2.8.29|~3.0.0", + "symfony/http-kernel": "~2.8|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/routing": "~2.8|~3.0", - "symfony/security": "~2.8|~3.0", - "symfony/security-acl": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0", - "symfony/templating": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2", - "symfony/web-link": "~3.3", - "symfony/yaml": "~2.8|~3.0" + "symfony/routing": "~2.2|~3.0.0", + "symfony/security": "~2.6|~3.0.0", + "symfony/security-acl": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.2|~3.0.0", + "symfony/templating": "~2.1|~3.0.0", + "symfony/translation": "~2.7|~3.0.0", + "symfony/var-dumper": "~2.7.16|~2.8.9|~3.0.9", + "symfony/yaml": "^2.0.5|~3.0.0" }, "suggest": { "symfony/asset": "For using the AssetExtension", @@ -835,13 +759,12 @@ "symfony/templating": "For using the TwigEngine", "symfony/translation": "For using the TranslationExtension", "symfony/var-dumper": "For using the DumpExtension", - "symfony/web-link": "For using the WebLinkExtension", "symfony/yaml": "For using the YamlExtension" }, "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -868,35 +791,34 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2017-07-26T06:42:48+00:00" + "time": "2018-04-20T06:15:58+00:00" }, { "name": "twig/twig", - "version": "v2.4.3", + "version": "v1.35.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2" + "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/eab7c3288ae6603d7d6f92b531626af2b162d1f2", - "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f", + "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f", "shasum": "" }, "require": { - "php": "^7.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=5.3.3" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.3@dev" + "symfony/debug": "^2.7", + "symfony/phpunit-bridge": "^3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "1.35-dev" } }, "autoload": { @@ -934,22 +856,22 @@ "keywords": [ "templating" ], - "time": "2017-06-07T18:47:58+00:00" + "time": "2018-03-20T04:25:58+00:00" } ], "packages-dev": [ { "name": "doctrine/annotations", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f" + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "shasum": "" }, "require": { @@ -958,12 +880,12 @@ }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -1004,7 +926,7 @@ "docblock", "parser" ], - "time": "2017-07-22T10:58:02+00:00" + "time": "2017-12-06T07:11:42+00:00" }, { "name": "doctrine/instantiator", @@ -1114,204 +1036,42 @@ ], "time": "2014-09-09T13:34:57+00:00" }, - { - "name": "friendsofphp/php-cs-fixer", - "version": "v2.2.6", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "c1cc52c242f17c4d52d9601159631da488fac7a4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c1cc52c242f17c4d52d9601159631da488fac7a4", - "reference": "c1cc52c242f17c4d52d9601159631da488fac7a4", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.2", - "ext-json": "*", - "ext-tokenizer": "*", - "gecko-packages/gecko-php-unit": "^2.0", - "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.4", - "symfony/console": "^2.4 || ^3.0", - "symfony/event-dispatcher": "^2.1 || ^3.0", - "symfony/filesystem": "^2.4 || ^3.0", - "symfony/finder": "^2.2 || ^3.0", - "symfony/options-resolver": "^2.6 || ^3.0", - "symfony/polyfill-php54": "^1.0", - "symfony/polyfill-php55": "^1.3", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-php72": "^1.4", - "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0" - }, - "conflict": { - "hhvm": "<3.18" - }, - "require-dev": { - "johnkary/phpunit-speedtrap": "^1.0.1", - "justinrainbow/json-schema": "^5.0", - "phpunit/phpunit": "^4.8.35 || ^5.4.3", - "satooshi/php-coveralls": "^1.0", - "symfony/phpunit-bridge": "^3.2.2" - }, - "suggest": { - "ext-mbstring": "For handling non-UTF8 characters in cache signature.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." - }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" - }, - "classmap": [ - "tests/Test/AbstractFixerTestCase.php", - "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/IntegrationCase.php", - "tests/Test/IntegrationCaseFactory.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "A tool to automatically fix PHP code style", - "time": "2017-08-22T14:08:16+00:00" - }, - { - "name": "gecko-packages/gecko-php-unit", - "version": "v2.1", - "source": { - "type": "git", - "url": "https://github.com/GeckoPackages/GeckoPHPUnit.git", - "reference": "5b9e9622c7efd3b22655270b80c03f9e52878a6e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/5b9e9622c7efd3b22655270b80c03f9e52878a6e", - "reference": "5b9e9622c7efd3b22655270b80c03f9e52878a6e", - "shasum": "" - }, - "require": { - "php": "^5.3.6 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.4.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "GeckoPackages\\PHPUnit\\": "src\\PHPUnit" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Additional PHPUnit tests.", - "homepage": "https://github.com/GeckoPackages", - "keywords": [ - "extension", - "filesystem", - "phpunit" - ], - "time": "2017-06-20T11:22:48+00:00" - }, - { - "name": "ircmaxell/password-compat", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "4.*" - }, - "type": "library", - "autoload": { - "files": [ - "lib/password.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", - "homepage": "http://blog.ircmaxell.com" - } - ], - "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", - "homepage": "https://github.com/ircmaxell/password_compat", - "keywords": [ - "hashing", - "password" - ], - "time": "2014-11-20T16:49:30+00:00" - }, { "name": "myclabs/deep-copy", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", - "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^4.1" }, "type": "library", "autoload": { "psr-4": { "DeepCopy\\": "src/DeepCopy/" - } + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", "keywords": [ "clone", "copy", @@ -1319,101 +1079,20 @@ "object", "object graph" ], - "time": "2017-04-12T18:52:22+00:00" - }, - { - "name": "paragonie/random_compat", - "version": "v2.0.10", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", - "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", - "shasum": "" - }, - "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "pseudorandom", - "random" - ], - "time": "2017-03-13T16:27:32+00:00" - }, - { - "name": "pdepend/pdepend", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1537f19d62d7b30c13ac173270106df7c6b9c459", - "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459", - "shasum": "" - }, - "require": { - "php": ">=5.2.3" - }, - "bin": [ - "src/bin/pdepend" - ], - "type": "library", - "autoload": { - "psr-0": { - "PHP_": "src/main/php/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Official version of pdepend to be handled with Composer", - "time": "2013-12-04T17:46:00+00:00" + "time": "2017-10-19T19:58:43+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "shasum": "" }, "require": { @@ -1454,33 +1133,39 @@ "reflection", "static analysis" ], - "time": "2015-12-27T11:43:31+00:00" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -1499,20 +1184,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08T06:39:58+00:00" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.3.0", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { @@ -1546,124 +1231,37 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03T08:32:36+00:00" - }, - { - "name": "phploc/phploc", - "version": "2.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phploc.git", - "reference": "322ad07c112d5c6832abed4269d648cacff5959b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/322ad07c112d5c6832abed4269d648cacff5959b", - "reference": "322ad07c112d5c6832abed4269d648cacff5959b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/finder-facade": "~1.1", - "sebastian/git": "~1.0", - "sebastian/version": "~1.0", - "symfony/console": "~2.2" - }, - "bin": [ - "phploc" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "A tool for quickly measuring the size of a PHP project.", - "homepage": "https://github.com/sebastianbergmann/phploc", - "time": "2014-06-25T08:11:02+00:00" - }, - { - "name": "phpmd/phpmd", - "version": "1.5.1", - "source": { - "type": "git", - "url": "https://github.com/phpmd/phpmd.git", - "reference": "f2d47500f4c5f80ee442d95829c62c2ece2bbeb6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/f2d47500f4c5f80ee442d95829c62c2ece2bbeb6", - "reference": "f2d47500f4c5f80ee442d95829c62c2ece2bbeb6", - "shasum": "" - }, - "require": { - "pdepend/pdepend": "1.1.*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.*@stable", - "squizlabs/php_codesniffer": "@stable" - }, - "bin": [ - "src/bin/phpmd" - ], - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "../../pdepend/pdepend/src/main/php", - "src/main/php" - ], - "license": [ - "BSD-3-Clause" - ], - "description": "Official version of PHPMD handled with Composer.", - "time": "2014-09-16T14:26:49+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1|^2.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1696,7 +1294,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1763,16 +1361,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -1806,7 +1404,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -1900,16 +1498,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { @@ -1945,20 +1543,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-08-20T05:47:52+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.21", + "version": "5.7.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db" + "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db", - "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", + "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", "shasum": "" }, "require": { @@ -1982,8 +1580,8 @@ "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0.3|~2.0", - "symfony/yaml": "~2.1|~3.0" + "sebastian/version": "^1.0.6|^2.0.1", + "symfony/yaml": "~2.1|~3.0|~4.0" }, "conflict": { "phpdocumentor/reflection-docblock": "3.0.2" @@ -2027,7 +1625,7 @@ "testing", "xunit" ], - "time": "2017-06-21T08:11:54+00:00" + "time": "2018-02-01T05:50:59+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -2366,91 +1964,6 @@ ], "time": "2016-11-19T08:54:04+00:00" }, - { - "name": "sebastian/finder-facade", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9", - "reference": "2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9", - "shasum": "" - }, - "require": { - "symfony/finder": "~2.3|~3.0", - "theseer/fdomdocument": "~1.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", - "homepage": "https://github.com/sebastianbergmann/finder-facade", - "time": "2016-02-17T07:02:23+00:00" - }, - { - "name": "sebastian/git", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/git.git", - "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba", - "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Simple wrapper for Git", - "homepage": "http://www.github.com/sebastianbergmann/git", - "keywords": [ - "git" - ], - "abandoned": true, - "time": "2013-08-04T09:35:29+00:00" - }, { "name": "sebastian/global-state", "version": "1.1.1", @@ -2548,57 +2061,6 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "time": "2017-02-18T15:18:39+00:00" }, - { - "name": "sebastian/phpcpd", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpcpd.git", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-timer": ">=1.0.6", - "sebastian/finder-facade": "~1.1", - "sebastian/version": "~1.0|~2.0", - "symfony/console": "~2.7|^3.0", - "theseer/fdomdocument": "~1.4" - }, - "bin": [ - "phpcpd" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Copy/Paste Detector (CPD) for PHP code.", - "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17T19:32:49+00:00" - }, { "name": "sebastian/recursion-context", "version": "2.0.0", @@ -2696,19 +2158,27 @@ }, { "name": "sebastian/version", - "version": "1.0.6", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", "shasum": "" }, + "require": { + "php": ">=5.6" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -2727,29 +2197,29 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21T13:59:46+00:00" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/browser-kit", - "version": "v3.3.6", + "version": "v2.8.39", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0" + "reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0", - "reference": "8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02", + "reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/dom-crawler": "~2.8|~3.0" + "php": ">=5.3.9", + "symfony/dom-crawler": "~2.1|~3.0.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/css-selector": "^2.0.5|~3.0.0", + "symfony/process": "~2.3.34|^2.7.6|~3.0.0" }, "suggest": { "symfony/process": "" @@ -2757,7 +2227,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2784,36 +2254,24 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-07-12T13:03:20+00:00" + "time": "2018-03-19T21:11:56+00:00" }, { - "name": "symfony/console", - "version": "v2.8.26", + "name": "symfony/css-selector", + "version": "v2.8.39", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd" + "url": "https://github.com/symfony/css-selector.git", + "reference": "3cdc270724e4666006118283c700a4d7f9cbe264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/32a3c6b3398de5db8ed381f4ef92970c59c2fcdd", - "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/3cdc270724e4666006118283c700a4d7f9cbe264", + "reference": "3cdc270724e4666006118283c700a4d7f9cbe264", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/debug": "^2.7.2|~3.0.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" + "php": ">=5.3.9" }, "type": "library", "extra": { @@ -2821,55 +2279,6 @@ "dev-master": "2.8-dev" } }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2017-07-29T21:26:04+00:00" - }, - { - "name": "symfony/css-selector", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "4d882dced7b995d5274293039370148e291808f2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4d882dced7b995d5274293039370148e291808f2", - "reference": "4d882dced7b995d5274293039370148e291808f2", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" @@ -2898,20 +2307,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-05-01T15:01:29+00:00" + "time": "2018-03-10T18:19:36+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.3.6", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1" + "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1", - "reference": "fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dff8fecf1f56990d88058e3a1885c2a5f1b8e970", + "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970", "shasum": "" }, "require": { @@ -2927,7 +2336,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2954,407 +2363,30 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-05-25T23:10:31+00:00" - }, - { - "name": "symfony/finder", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "time": "2017-06-01T21:01:25+00:00" - }, - { - "name": "symfony/options-resolver", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ff48982d295bcac1fd861f934f041ebc73ae40f0", - "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony OptionsResolver Component", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "time": "2017-04-12T14:14:56+00:00" - }, - { - "name": "symfony/polyfill-php54", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "b7763422a5334c914ef0298ed21b253d25913a6e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e", - "reference": "b7763422a5334c914ef0298ed21b253d25913a6e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2017-06-14T15:44:48+00:00" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/29b1381d66f16e0581aab0b9f678ccf073288f68", - "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2017-06-14T15:44:48+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "b6482e68974486984f59449ecea1fbbb22ff840f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/b6482e68974486984f59449ecea1fbbb22ff840f", - "reference": "b6482e68974486984f59449ecea1fbbb22ff840f", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2017-06-14T15:44:48+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8abc9097f5001d310f0edba727469c988acc6ea7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8abc9097f5001d310f0edba727469c988acc6ea7", - "reference": "8abc9097f5001d310f0edba727469c988acc6ea7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2017-07-11T13:25:55+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "602a15299dc01556013b07167d4f5d3a60e90d15" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/602a15299dc01556013b07167d4f5d3a60e90d15", - "reference": "602a15299dc01556013b07167d4f5d3a60e90d15", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2017-04-12T14:14:56+00:00" + "time": "2016-07-30T07:22:48+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.6", + "version": "v4.0.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" + "reference": "275ad099e4cbe612a2acbca14a16dd1c5311324d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "url": "https://api.github.com/repos/symfony/yaml/zipball/275ad099e4cbe612a2acbca14a16dd1c5311324d", + "reference": "275ad099e4cbe612a2acbca14a16dd1c5311324d", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -3362,7 +2394,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3389,60 +2421,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-07-23T12:43:26+00:00" - }, - { - "name": "theseer/fdomdocument", - "version": "1.6.6", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", - "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" + "time": "2018-04-08T08:49:08+00:00" }, { "name": "webmozart/assert", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", "shasum": "" }, "require": { @@ -3479,7 +2471,7 @@ "check", "validate" ], - "time": "2016-11-23T20:04:58+00:00" + "time": "2018-01-29T19:49:41+00:00" } ], "aliases": [], diff --git a/src/Application.php b/src/Application.php index 094b520..66a2b03 100644 --- a/src/Application.php +++ b/src/Application.php @@ -7,8 +7,8 @@ use GitList\Provider\RepositoryUtilServiceProvider; use GitList\Provider\RoutingUtilServiceProvider; use GitList\Provider\ViewUtilServiceProvider; use Silex\Application as SilexApplication; -use Silex\Provider\RoutingServiceProvider; use Silex\Provider\TwigServiceProvider; +use Silex\Provider\UrlGeneratorServiceProvider; use Symfony\Component\Filesystem\Filesystem; /** @@ -40,38 +40,38 @@ class Application extends SilexApplication $this['avatar.query'] = $config->get('avatar', 'query'); // Register services - $this->register(new TwigServiceProvider(), [ - 'twig.path' => [$this->getThemePath($this['theme']), $this->getThemePath('default')], + $this->register(new TwigServiceProvider(), array( + 'twig.path' => array($this->getThemePath($this['theme']), $this->getThemePath('default')), 'twig.options' => $config->get('app', 'cache') ? - ['cache' => $this->getCachePath() . 'views'] : [], - ]); + array('cache' => $this->getCachePath() . 'views') : array(), + )); $repositories = $config->get('git', 'repositories'); $this['git.projects'] = $config->get('git', 'project_list') ? $this->parseProjectList($config->get('git', 'project_list')) : false; - $this->register(new GitServiceProvider(), [ + $this->register(new GitServiceProvider(), array( 'git.client' => $config->get('git', 'client'), 'git.repos' => $repositories, 'ini.file' => 'config.ini', 'git.hidden' => $config->get('git', 'hidden') ? - $config->get('git', 'hidden') : [], + $config->get('git', 'hidden') : array(), 'git.default_branch' => $config->get('git', 'default_branch') ? $config->get('git', 'default_branch') : 'master', - ]); + )); $this->register(new ViewUtilServiceProvider()); $this->register(new RepositoryUtilServiceProvider()); - $this->register(new RoutingServiceProvider()); $this->register(new RoutingUtilServiceProvider()); + $this->register(new UrlGeneratorServiceProvider()); - $this->extend('twig', function ($twig, $app) use ($config) { + $this['twig'] = $this->share($this->extend('twig', function ($twig, $app) use ($config) { $twig->addFilter(new \Twig_SimpleFilter('htmlentities', 'htmlentities')); $twig->addFilter(new \Twig_SimpleFilter('md5', 'md5')); - $twig->addFilter(new \Twig_SimpleFilter('format_date', [$app, 'formatDate'])); - $twig->addFilter(new \Twig_SimpleFilter('format_size', [$app, 'formatSize'])); - $twig->addFunction(new \Twig_SimpleFunction('avatar', [$app, 'getAvatar'])); + $twig->addFilter(new \Twig_SimpleFilter('format_date', array($app, 'formatDate'))); + $twig->addFilter(new \Twig_SimpleFilter('format_size', array($app, 'formatSize'))); + $twig->addFunction(new \Twig_SimpleFunction('avatar', array($app, 'getAvatar'))); $twig->addGlobal('theme', $app['theme']); $twig->addGlobal('title', $config->get('app', 'title') ? $config->get('app', 'title') : 'GitList'); $twig->addGlobal('show_http_remote', $config->get('clone_button', 'show_http_remote')); @@ -85,11 +85,11 @@ class Application extends SilexApplication $twig->addGlobal('ssh_host', $config->get('clone_button', 'ssh_host')); return $twig; - }); + })); - $this['escaper.argument'] = function () { + $this['escaper.argument'] = $this->share(function() { return new Escaper\ArgumentEscaper(); - }; + }); // Handle errors $this->error(function (\Exception $e, $code) use ($app) { @@ -97,9 +97,9 @@ class Application extends SilexApplication return; } - return $app['twig']->render('error.twig', [ + return $app['twig']->render('error.twig', array( 'message' => $e->getMessage(), - ]); + )); }); $this->finish(function () use ($app, $config) { @@ -118,7 +118,7 @@ class Application extends SilexApplication public function formatSize($size) { $mod = 1000; - $units = ['B', 'kB', 'MB', 'GB']; + $units = array('B', 'kB', 'MB', 'GB'); for ($i = 0; $size > $mod; $i++) { $size /= $mod; } @@ -129,7 +129,7 @@ class Application extends SilexApplication public function getAvatar($email, $size) { $url = $this['avatar.url'] ? $this['avatar.url'] : '//gravatar.com/avatar/'; - $query = ["s=$size"]; + $query = array("s=$size"); if (is_string($this['avatar.query'])) { $query[] = $this['avatar.query']; } elseif (is_array($this['avatar.query'])) { @@ -174,7 +174,7 @@ class Application extends SilexApplication public function parseProjectList($project_list) { - $projects = []; + $projects = array(); $file = fopen($project_list, 'r'); while ($file && !feof($file)) { $projects[] = trim(fgets($file)); diff --git a/src/Config.php b/src/Config.php index 3d9f53e..2a00b7a 100644 --- a/src/Config.php +++ b/src/Config.php @@ -6,7 +6,7 @@ class Config { protected $data; - public function __construct($data = []) + public function __construct($data = array()) { $this->data = $data; } diff --git a/src/Controller/BlobController.php b/src/Controller/BlobController.php index 4bcd677..a9bc4ed 100644 --- a/src/Controller/BlobController.php +++ b/src/Controller/BlobController.php @@ -2,7 +2,7 @@ namespace GitList\Controller; -use Silex\Api\ControllerProviderInterface; +use Silex\ControllerProviderInterface; use Silex\Application; use Symfony\Component\HttpFoundation\Response; @@ -25,13 +25,13 @@ class BlobController implements ControllerProviderInterface $fileType = $app['util.repository']->getFileType($file); if ($fileType !== 'image' && $app['util.repository']->isBinary($file)) { - return $app->redirect($app['url_generator']->generate('blob_raw', [ + return $app->redirect($app['url_generator']->generate('blob_raw', array( 'repo' => $repo, 'commitishPath' => $commitishPath, - ])); + ))); } - return $app['twig']->render('file.twig', [ + return $app['twig']->render('file.twig', array( 'file' => $file, 'fileType' => $fileType, 'blob' => $blob->output(), @@ -40,7 +40,7 @@ class BlobController implements ControllerProviderInterface 'breadcrumbs' => $breadcrumbs, 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('commitishPath', '.+') ->convert('commitishPath', 'escaper.argument:escape') @@ -56,7 +56,7 @@ class BlobController implements ControllerProviderInterface $blob = $repository->getBlob("$branch:\"$file\"")->output(); - $headers = []; + $headers = array(); if ($app['util.repository']->isBinary($file)) { $headers['Content-Disposition'] = 'attachment; filename="' . $file . '"'; $headers['Content-Type'] = 'application/octet-stream'; @@ -79,12 +79,12 @@ class BlobController implements ControllerProviderInterface $filePatchesLog = $repository->getCommitsLogPatch($file); $breadcrumbs = $app['util.view']->getBreadcrumbs($file); - return $app['twig']->render('logpatch.twig', [ + return $app['twig']->render('logpatch.twig', array( 'branch' => $branch, 'repo' => $repo, 'breadcrumbs' => $breadcrumbs, 'commits' => $filePatchesLog, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('commitishPath', '.+') ->convert('commitishPath', 'escaper.argument:escape') diff --git a/src/Controller/CommitController.php b/src/Controller/CommitController.php index b48d3de..f74e99f 100644 --- a/src/Controller/CommitController.php +++ b/src/Controller/CommitController.php @@ -2,7 +2,7 @@ namespace GitList\Controller; -use Silex\Api\ControllerProviderInterface; +use Silex\ControllerProviderInterface; use Silex\Application; use Symfony\Component\HttpFoundation\Request; @@ -16,7 +16,7 @@ class CommitController implements ControllerProviderInterface $subRequest = Request::create( '/' . $repo . '/commits/master/search', 'POST', - ['query' => $request->get('query')] + array('query' => $request->get('query')) ); return $app->handle($subRequest, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST); @@ -37,7 +37,7 @@ class CommitController implements ControllerProviderInterface $type = $file ? "$branch -- \"$file\"" : $branch; $pager = $app['util.view']->getPager($request->get('page'), $repository->getTotalCommits($type)); $commits = $repository->getPaginatedCommits($type, $pager['current']); - $categorized = []; + $categorized = array(); foreach ($commits as $commit) { $date = $commit->getCommiterDate(); @@ -47,7 +47,7 @@ class CommitController implements ControllerProviderInterface $template = $request->isXmlHttpRequest() ? 'commits_list.twig' : 'commits.twig'; - return $app['twig']->render($template, [ + return $app['twig']->render($template, array( 'page' => 'commits', 'pager' => $pager, 'repo' => $repo, @@ -56,7 +56,7 @@ class CommitController implements ControllerProviderInterface 'tags' => $repository->getTags(), 'commits' => $categorized, 'file' => $file, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) ->value('commitishPath', null) @@ -68,7 +68,7 @@ class CommitController implements ControllerProviderInterface $query = $request->get('query'); $commits = $repository->searchCommitLog($query, $branch); - $categorized = []; + $categorized = array(); foreach ($commits as $commit) { $date = $commit->getCommiterDate(); @@ -76,7 +76,7 @@ class CommitController implements ControllerProviderInterface $categorized[$date][] = $commit; } - return $app['twig']->render('searchcommits.twig', [ + return $app['twig']->render('searchcommits.twig', array( 'repo' => $repo, 'branch' => $branch, 'file' => '', @@ -84,7 +84,7 @@ class CommitController implements ControllerProviderInterface 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), 'query' => $query, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', $app['util.routing']->getBranchRegex()) ->convert('branch', 'escaper.argument:escape') @@ -95,11 +95,11 @@ class CommitController implements ControllerProviderInterface $commit = $repository->getCommit($commit); $branch = $repository->getHead(); - return $app['twig']->render('commit.twig', [ + return $app['twig']->render('commit.twig', array( 'branch' => $branch, 'repo' => $repo, 'commit' => $commit, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('commit', '[a-f0-9^]+') ->bind('commit'); @@ -114,14 +114,14 @@ class CommitController implements ControllerProviderInterface $blames = $repository->getBlame("$branch -- \"$file\""); - return $app['twig']->render('blame.twig', [ + return $app['twig']->render('blame.twig', array( 'file' => $file, 'repo' => $repo, 'branch' => $branch, 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), 'blames' => $blames, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) ->convert('commitishPath', 'escaper.argument:escape') diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index d372f34..fe94bff 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -2,7 +2,7 @@ namespace GitList\Controller; -use Silex\Api\ControllerProviderInterface; +use Silex\ControllerProviderInterface; use Silex\Application; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -16,9 +16,9 @@ class MainController implements ControllerProviderInterface $route->get('/', function () use ($app) { $repositories = $app['git']->getRepositories($app['git.repos']); - return $app['twig']->render('index.twig', [ + return $app['twig']->render('index.twig', array( 'repositories' => $repositories, - ]); + )); })->bind('homepage'); $route->get('/refresh', function (Request $request) use ($app) { @@ -36,14 +36,14 @@ class MainController implements ControllerProviderInterface $stats = $repository->getStatistics($branch); $authors = $repository->getAuthorStatistics($branch); - return $app['twig']->render('stats.twig', [ + return $app['twig']->render('stats.twig', array( 'repo' => $repo, 'branch' => $branch, 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), 'stats' => $stats, 'authors' => $authors, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', $app['util.routing']->getBranchRegex()) ->value('branch', null) @@ -59,13 +59,13 @@ class MainController implements ControllerProviderInterface $commits = $repository->getPaginatedCommits($branch); - $html = $app['twig']->render('rss.twig', [ + $html = $app['twig']->render('rss.twig', array( 'repo' => $repo, 'branch' => $branch, 'commits' => $commits, - ]); + )); - return new Response($html, 200, ['Content-Type' => 'application/rss+xml']); + return new Response($html, 200, array('Content-Type' => 'application/rss+xml')); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', $app['util.routing']->getBranchRegex()) ->value('branch', null) diff --git a/src/Controller/NetworkController.php b/src/Controller/NetworkController.php index c0e7b90..4f47594 100644 --- a/src/Controller/NetworkController.php +++ b/src/Controller/NetworkController.php @@ -4,7 +4,7 @@ namespace GitList\Controller; use GitList\Git\Repository; use Gitter\Model\Commit\Commit; -use Silex\Api\ControllerProviderInterface; +use Silex\ControllerProviderInterface; use Silex\Application; class NetworkController implements ControllerProviderInterface @@ -26,29 +26,29 @@ class NetworkController implements ControllerProviderInterface $pager = $app['util.view']->getPager($page, $repository->getTotalCommits($commitishPath)); $commits = $repository->getPaginatedCommits($commitishPath, $pager['current']); - $jsonFormattedCommits = []; + $jsonFormattedCommits = array(); foreach ($commits as $commit) { $detailsUrl = $app['url_generator']->generate( 'commit', - [ + array( 'repo' => $repo, 'commit' => $commit->getHash(), - ] + ) ); - $jsonFormattedCommits[$commit->getHash()] = [ + $jsonFormattedCommits[$commit->getHash()] = array( 'hash' => $commit->getHash(), 'parentsHash' => $commit->getParentsHash(), 'date' => $commit->getDate()->format('U'), 'message' => htmlentities($commit->getMessage()), 'details' => $detailsUrl, - 'author' => [ + 'author' => array( 'name' => $commit->getAuthor()->getName(), 'email' => $commit->getAuthor()->getEmail(), 'image' => $app->getAvatar($commit->getAuthor()->getEmail(), 40), - ], - ]; + ), + ); } $nextPageUrl = null; @@ -56,36 +56,36 @@ class NetworkController implements ControllerProviderInterface if ($pager['last'] !== $pager['current']) { $nextPageUrl = $app['url_generator']->generate( 'networkData', - [ + array( 'repo' => $repo, 'commitishPath' => $commitishPath, 'page' => $pager['next'], - ] + ) ); } // when no commits are given, return an empty response - issue #369 if (count($commits) === 0) { return $app->json( - [ + array( 'repo' => $repo, 'commitishPath' => $commitishPath, 'nextPage' => null, 'start' => null, 'commits' => $jsonFormattedCommits, - ], + ), 200 ); } return $app->json( - [ + array( 'repo' => $repo, 'commitishPath' => $commitishPath, 'nextPage' => $nextPageUrl, 'start' => $commits[0]->getHash(), 'commits' => $jsonFormattedCommits, - ], + ), 200 ); } @@ -111,11 +111,11 @@ class NetworkController implements ControllerProviderInterface return $app['twig']->render( 'network.twig', - [ + array( 'repo' => $repo, 'branch' => $branch, 'commitishPath' => $commitishPath, - ] + ) ); } )->assert('repo', $app['util.routing']->getRepositoryRegex()) diff --git a/src/Controller/TreeController.php b/src/Controller/TreeController.php index 7d185ea..33325b9 100644 --- a/src/Controller/TreeController.php +++ b/src/Controller/TreeController.php @@ -2,7 +2,7 @@ namespace GitList\Controller; -use Silex\Api\ControllerProviderInterface; +use Silex\ControllerProviderInterface; use Silex\Application; use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\Request; @@ -32,7 +32,7 @@ class TreeController implements ControllerProviderInterface $parent = ''; } - return $app['twig']->render('tree.twig', [ + return $app['twig']->render('tree.twig', array( 'files' => $files->output(), 'repo' => $repo, 'branch' => $branch, @@ -42,7 +42,7 @@ class TreeController implements ControllerProviderInterface 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), 'readme' => $app['util.repository']->getReadme($repository, $branch, $tree ? "$tree" : ''), - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex()) ->convert('commitishPath', 'escaper.argument:escape') @@ -55,10 +55,10 @@ class TreeController implements ControllerProviderInterface } $query = $request->get('query'); - $breadcrumbs = [['dir' => 'Search results for: ' . $query, 'path' => '']]; + $breadcrumbs = array(array('dir' => 'Search results for: ' . $query, 'path' => '')); $results = $repository->searchTree($query, $branch); - return $app['twig']->render('search.twig', [ + return $app['twig']->render('search.twig', array( 'results' => $results, 'repo' => $repo, 'branch' => $branch, @@ -67,7 +67,7 @@ class TreeController implements ControllerProviderInterface 'branches' => $repository->getBranches(), 'tags' => $repository->getTags(), 'query' => $query, - ]); + )); })->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('branch', $app['util.routing']->getBranchRegex()) ->convert('branch', 'escaper.argument:escape') diff --git a/src/Controller/TreeGraphController.php b/src/Controller/TreeGraphController.php index 0e9a4e9..796876c 100644 --- a/src/Controller/TreeGraphController.php +++ b/src/Controller/TreeGraphController.php @@ -2,7 +2,7 @@ namespace GitList\Controller; -use Silex\Api\ControllerProviderInterface; +use Silex\ControllerProviderInterface; use Silex\Application; class TreeGraphController implements ControllerProviderInterface @@ -21,17 +21,17 @@ class TreeGraphController implements ControllerProviderInterface '--pretty=format:"B[%d] C[%H] D[%ad] A[%an] E[%ae] H[%h] S[%s]"'; $rawRows = $repository->getClient()->run($repository, $command); $rawRows = explode("\n", $rawRows); - $graphItems = []; + $graphItems = array(); foreach ($rawRows as $row) { if (preg_match("/^(.+?)(\s(B\[(.*?)\])? C\[(.+?)\] D\[(.+?)\] A\[(.+?)\] E\[(.+?)\] H\[(.+?)\] S\[(.+?)\])?$/", $row, $output)) { if (!isset($output[4])) { - $graphItems[] = [ + $graphItems[] = array( 'relation' => $output[1], - ]; + ); continue; } - $graphItems[] = [ + $graphItems[] = array( 'relation' => $output[1], 'branch' => $output[4], 'rev' => $output[5], @@ -40,7 +40,7 @@ class TreeGraphController implements ControllerProviderInterface 'author_email' => $output[8], 'short_rev' => $output[9], 'subject' => preg_replace('/(^|\s)(#[[:xdigit:]]+)(\s|$)/', '$1$2$3', $output[10]), - ]; + ); } } @@ -53,12 +53,12 @@ class TreeGraphController implements ControllerProviderInterface return $app['twig']->render( 'treegraph.twig', - [ + array( 'repo' => $repo, 'branch' => $branch, 'commitishPath' => $commitishPath, 'graphItems' => $graphItems, - ] + ) ); } )->assert('repo', $app['util.routing']->getRepositoryRegex()) diff --git a/src/Git/Client.php b/src/Git/Client.php index 5695412..d6c6d1f 100644 --- a/src/Git/Client.php +++ b/src/Git/Client.php @@ -36,7 +36,7 @@ class Client extends BaseClient */ public function getRepositories($paths) { - $allRepositories = []; + $allRepositories = array(); foreach ($paths as $path) { $repositories = $this->recurseDirectory($path); @@ -161,7 +161,7 @@ class Client extends BaseClient { $dir = new \DirectoryIterator($path); - $repositories = []; + $repositories = array(); foreach ($dir as $file) { if ($file->isDot()) { @@ -219,11 +219,11 @@ class Client extends BaseClient continue; } - $repositories[$repoName] = [ + $repositories[$repoName] = array( 'name' => $repoName, 'path' => $file->getPathname(), 'description' => $description, - ]; + ); continue; } diff --git a/src/Git/Repository.php b/src/Git/Repository.php index 136907c..74ce4ea 100644 --- a/src/Git/Repository.php +++ b/src/Git/Repository.php @@ -57,7 +57,7 @@ class Repository extends BaseRepository . "\" $file" ); - $patch_collection = []; + $patch_collection = array(); foreach (preg_split('/(' . $record_delimiter . '\)/', $file_patches, null, PREG_SPLIT_NO_EMPTY) as $patches) { $patches = '' . $patches; $xmlEnd = strpos($patches, '') + 7; @@ -128,7 +128,7 @@ class Repository extends BaseRepository */ public function getBlame($file) { - $blame = []; + $blame = array(); $logs = $this->getClient()->run($this, "blame --root -sl $file"); $logs = explode("\n", $logs); @@ -144,11 +144,11 @@ class Repository extends BaseRepository $currentCommit = $match[1][0]; if ($currentCommit != $previousCommit) { ++$i; - $blame[$i] = [ + $blame[$i] = array( 'line' => '', 'commit' => $currentCommit, 'commitShort' => substr($currentCommit, 0, 8), - ]; + ); } $blame[$i]['line'] .= $match[3][0] . PHP_EOL; @@ -167,7 +167,7 @@ class Repository extends BaseRepository */ public function readDiffLogs(array $logs) { - $diffs = []; + $diffs = array(); $lineNumOld = 0; $lineNumNew = 0; foreach ($logs as $log) { @@ -205,7 +205,7 @@ class Repository extends BaseRepository // Handle binary files properly. if ('Binary' === substr($log, 0, 6)) { - $m = []; + $m = array(); if (preg_match('/Binary files (.+) and (.+) differ/', $log, $m)) { $diff->setOld($m[1]); $diff->setNew(" {$m[2]}"); @@ -275,7 +275,7 @@ class Repository extends BaseRepository try { $logs = $this->getPrettyFormat($command); } catch (\RuntimeException $e) { - return []; + return array(); } foreach ($logs as $log) { @@ -290,7 +290,7 @@ class Repository extends BaseRepository public function searchCommitLog($query, $branch) { $query = escapeshellarg($query); - $query = strtr($query, ['[' => '\\[', ']' => '\\]']); + $query = strtr($query, array('[' => '\\[', ']' => '\\]')); $command = "log --grep={$query} -i --pretty=format:\"%H" . '%h%T%P' @@ -304,7 +304,7 @@ class Repository extends BaseRepository try { $logs = $this->getPrettyFormat($command); } catch (\RuntimeException $e) { - return []; + return array(); } foreach ($logs as $log) { @@ -332,7 +332,7 @@ class Repository extends BaseRepository } $results = explode("\n", $results); - $searchResults = []; + $searchResults = array(); foreach ($results as $result) { if ($result == '') { @@ -366,7 +366,7 @@ class Repository extends BaseRepository foreach ($logs as $user => $count) { $user = explode('||', $user); - $data[] = ['name' => $user[0], 'email' => $user[1], 'commits' => $count]; + $data[] = array('name' => $user[0], 'email' => $user[1], 'commits' => $count); } return $data; @@ -377,8 +377,8 @@ class Repository extends BaseRepository // Calculate amount of files, extensions and file size $logs = $this->getClient()->run($this, 'ls-tree -r -l ' . $branch); $lines = explode("\n", $logs); - $files = []; - $data['extensions'] = []; + $files = array(); + $data['extensions'] = array(); $data['size'] = 0; $data['files'] = 0; diff --git a/src/Provider/GitServiceProvider.php b/src/Provider/GitServiceProvider.php index 4e3c004..0ec0344 100644 --- a/src/Provider/GitServiceProvider.php +++ b/src/Provider/GitServiceProvider.php @@ -3,21 +3,25 @@ namespace GitList\Provider; use GitList\Git\Client; -use Pimple\Container; -use Pimple\ServiceProviderInterface; +use Silex\Application; +use Silex\ServiceProviderInterface; class GitServiceProvider implements ServiceProviderInterface { - public function register(Container $container) + public function register(Application $app) { - $container['git'] = function () use ($container) { - $options['path'] = $container['git.client']; - $options['hidden'] = $container['git.hidden']; - $options['projects'] = $container['git.projects']; - $options['ini.file'] = $container['ini.file']; - $options['default_branch'] = $container['git.default_branch']; + $app['git'] = function () use ($app) { + $options['path'] = $app['git.client']; + $options['hidden'] = $app['git.hidden']; + $options['projects'] = $app['git.projects']; + $options['ini.file'] = $app['ini.file']; + $options['default_branch'] = $app['git.default_branch']; return new Client($options); }; } + + public function boot(Application $app) + { + } } diff --git a/src/Provider/RepositoryUtilServiceProvider.php b/src/Provider/RepositoryUtilServiceProvider.php index a2c7e90..fb8000e 100644 --- a/src/Provider/RepositoryUtilServiceProvider.php +++ b/src/Provider/RepositoryUtilServiceProvider.php @@ -3,15 +3,19 @@ namespace GitList\Provider; use GitList\Util\Repository; -use Pimple\Container; -use Pimple\ServiceProviderInterface; +use Silex\Application; +use Silex\ServiceProviderInterface; class RepositoryUtilServiceProvider implements ServiceProviderInterface { - public function register(Container $container) + public function register(Application $app) { - $container['util.repository'] = function () use ($container) { - return new Repository($container); + $app['util.repository'] = function () use ($app) { + return new Repository($app); }; } + + public function boot(Application $app) + { + } } diff --git a/src/Provider/RoutingUtilServiceProvider.php b/src/Provider/RoutingUtilServiceProvider.php index 8263095..46efc08 100644 --- a/src/Provider/RoutingUtilServiceProvider.php +++ b/src/Provider/RoutingUtilServiceProvider.php @@ -3,15 +3,19 @@ namespace GitList\Provider; use GitList\Util\Routing; -use Pimple\Container; -use Pimple\ServiceProviderInterface; +use Silex\Application; +use Silex\ServiceProviderInterface; class RoutingUtilServiceProvider implements ServiceProviderInterface { - public function register(Container $container) + public function register(Application $app) { - $container['util.routing'] = function () use ($container) { - return new Routing($container); + $app['util.routing'] = function () use ($app) { + return new Routing($app); }; } + + public function boot(Application $app) + { + } } diff --git a/src/Provider/ViewUtilServiceProvider.php b/src/Provider/ViewUtilServiceProvider.php index b69a0fd..a3fc283 100644 --- a/src/Provider/ViewUtilServiceProvider.php +++ b/src/Provider/ViewUtilServiceProvider.php @@ -3,15 +3,19 @@ namespace GitList\Provider; use GitList\Util\View; -use Pimple\Container; -use Pimple\ServiceProviderInterface; +use Silex\Application; +use Silex\ServiceProviderInterface; class ViewUtilServiceProvider implements ServiceProviderInterface { - public function register(Container $container) + public function register(Application $app) { - $container['util.view'] = function () { + $app['util.view'] = function () { return new View(); }; } + + public function boot(Application $app) + { + } } diff --git a/src/Util/Repository.php b/src/Util/Repository.php index 0aaa60d..e15da8f 100644 --- a/src/Util/Repository.php +++ b/src/Util/Repository.php @@ -8,7 +8,7 @@ class Repository { protected $app; - protected $defaultFileTypes = [ + protected $defaultFileTypes = array( 'php' => 'php', 'c' => 'clike', 'h' => 'clike', @@ -94,14 +94,14 @@ class Repository 'jpeg' => 'image', 'bmp' => 'image', 'csproj' => 'xml', - ]; + ); - protected static $binaryTypes = [ + protected static $binaryTypes = array( 'exe', 'com', 'so', 'la', 'o', 'dll', 'pyc', 'jpg', 'jpeg', 'bmp', 'gif', 'png', 'xmp', 'pcx', 'svgz', 'ttf', 'tiff', 'oet', 'gz', 'tar', 'rar', 'zip', '7z', 'jar', 'class', 'odt', 'ods', 'pdf', 'doc', 'docx', 'dot', 'xls', 'xlsx', - ]; + ); public function __construct(Application $app) { @@ -179,10 +179,10 @@ class Repository foreach ($files as $file) { if (preg_match('/^readme*/i', $file['name'])) { - return [ + return array( 'filename' => $file['name'], 'content' => $repository->getBlob("$branch:\"$path{$file['name']}\"")->output(), - ]; + ); } } // No contextual readme, try to catch the main one if we are in deeper context @@ -190,7 +190,7 @@ class Repository return $this->getReadme($repository, $branch, ''); } - return []; + return array(); } /** @@ -230,6 +230,6 @@ class Repository } } - return [$branch, $tree]; + return array($branch, $tree); } } diff --git a/src/Util/Routing.php b/src/Util/Routing.php index 0f8316f..b307736 100644 --- a/src/Util/Routing.php +++ b/src/Util/Routing.php @@ -84,7 +84,7 @@ class Routing $path = substr($path, 1); } - return [$commitish, $path]; + return array($commitish, $path); } public function getBranchRegex() diff --git a/src/Util/View.php b/src/Util/View.php index 236ba72..9d8dc20 100644 --- a/src/Util/View.php +++ b/src/Util/View.php @@ -14,16 +14,16 @@ class View public function getBreadcrumbs($spec) { if (!$spec) { - return []; + return array(); } $paths = explode('/', $spec); foreach ($paths as $i => $path) { - $breadcrumbs[] = [ + $breadcrumbs[] = array( 'dir' => $path, 'path' => implode('/', array_slice($paths, 0, $i + 1)), - ]; + ); } return $breadcrumbs; @@ -39,11 +39,11 @@ class View $nextPage = $pageNumber + 1; $previousPage = $pageNumber - 1; - return ['current' => $pageNumber, + return array('current' => $pageNumber, 'next' => $nextPage, 'previous' => $previousPage, 'last' => $lastPage, 'total' => $totalCommits, - ]; + ); } } diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php index 908b913..e781ab5 100644 --- a/tests/InterfaceTest.php +++ b/tests/InterfaceTest.php @@ -29,7 +29,7 @@ class InterfaceTest extends WebTestCase } $options['path'] = getenv('GIT_CLIENT') ?: '/usr/bin/git'; - $options['hidden'] = [self::$tmpdir . '/hiddenrepo']; + $options['hidden'] = array(self::$tmpdir . '/hiddenrepo'); $options['default_branch'] = 'master'; $options['ini.file'] = 'config.ini'; $options['projects'] = false; @@ -144,7 +144,7 @@ class InterfaceTest extends WebTestCase $config->set('app', 'debug', false); $config->set('git', 'client', self::$gitPath); $config->set('git', 'default_branch', 'master'); - $config->set('git', 'repositories', [self::$tmpdir]); + $config->set('git', 'repositories', array(self::$tmpdir)); $app = require 'boot.php'; diff --git a/themes/default/twig/footer.twig b/themes/default/twig/footer.twig index 01ddbc9..fb94dab 100644 --- a/themes/default/twig/footer.twig +++ b/themes/default/twig/footer.twig @@ -1,3 +1,3 @@