commit 1e86e0d1686f243517dae645c700d4be71404c38
parent ba19b48bd10a40172339b5c2d75be8dbc741b67d
Author: Timo A. Hummel <felicitus@felicitus.org>
Date: Sun, 22 Apr 2018 20:18:11 +0200
Several package updates, added support for a base_url to allow running behind a reverse proxy when the paths are different
Diffstat:
7 files changed, 294 insertions(+), 293 deletions(-)
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -28,7 +28,6 @@ class AppKernel extends Kernel
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
- new JMS\TranslationBundle\JMSTranslationBundle(),
new \PartKeepr\RemoteFileLoader\PartKeeprRemoteFileLoaderBundle(),
new \FR3D\LdapBundle\FR3DLdapBundle(),
new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(),
diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist
@@ -159,6 +159,20 @@ $container->setParameter('partkeepr.frontend.auto_login.username', 'admin');
$container->setParameter('partkeepr.frontend.auto_login.password', 'admin');
/**
+ * Specifies the base_url for the PartKeepr frontend.
+ * Usually this is not required, but if you run PartKeepr behind a reverse
+ * proxy with a different path, you can set it here.
+ *
+ * Please note that you need to create an additional file, see
+ * https://wiki.partkeepr.org/wiki/KB00008:PartKeepr_behind_a_reverse_proxy
+ *
+ * Example: If PartKeepr runs on / within a docker container and your reverse
+ * proxy maps it on https://www.example.org/parts, you can set the
+ * base_url to https://www.example.org/parts
+ */
+$container->setParameter('partkeepr.frontend.base_url', false);
+
+/**
* Specifies the category path separator
*/
$container->setParameter('partkeepr.category.path_separator', ' ➤ ');
diff --git a/composer.json b/composer.json
@@ -44,9 +44,10 @@
"symfony/symfony": "~2.7",
"incenteev/composer-parameter-handler": "~2.0",
"doctrine/orm": "~2.5",
- "doctrine/doctrine-bundle": "~1.2",
+ "doctrine/doctrine-bundle": "~1.6",
"twig/extensions": "*",
- "symfony/assetic-bundle": "~2.3",
+ "twig/twig": "~1.35",
+ "symfony/assetic-bundle": "~2.8.2",
"symfony/swiftmailer-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4",
"sensio/distribution-bundle": "~4.0.0",
@@ -68,7 +69,6 @@
"escapestudios/wsse-authentication-bundle": "dev-advancedUserInterface",
"atelierspierrot/famfamfam-silk-sprite": "^1.0",
"reputation-vip/composer-assets-installer": "^1.0",
- "jms/translation-bundle": "dev-master",
"partkeepr/remote-file-loader": "dev-master",
"nfq-alpha/sprite-bundle": "dev-min-image-fix",
"symfony/property-access": "^2.7",
@@ -80,7 +80,7 @@
"guzzlehttp/guzzle": "6.2.2"
},
"require-dev": {
- "phpunit/phpunit": "5.2",
+ "phpunit/phpunit": "5.5",
"codeclimate/php-test-reporter": "dev-master",
"liip/functional-test-bundle": "~1.1"
},
diff --git a/composer.lock b/composer.lock
@@ -1,11 +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"
],
- "hash": "c3e5ce6a6e787f70af9507707a4d4bda",
- "content-hash": "24fc9d79360211eb7a32ff2535a8a273",
+ "content-hash": "440755ffdc7a9c540f4a4676481e2004",
"packages": [
{
"name": "atelierspierrot/famfamfam-silk-sprite",
@@ -52,7 +51,7 @@
"icons",
"sprite"
],
- "time": "2013-10-12 21:09:52"
+ "time": "2013-10-12T21:09:52+00:00"
},
{
"name": "behat/transliterator",
@@ -92,7 +91,7 @@
"slug",
"transliterator"
],
- "time": "2015-09-28 16:26:35"
+ "time": "2015-09-28T16:26:35+00:00"
},
{
"name": "brainbits/fugue-icons-bundle",
@@ -135,7 +134,7 @@
"fugue",
"icons"
],
- "time": "2013-05-15 12:31:26"
+ "time": "2013-05-15T12:31:26+00:00"
},
{
"name": "composer/installers",
@@ -242,7 +241,7 @@
"zend",
"zikula"
],
- "time": "2016-08-13 20:53:52"
+ "time": "2016-08-13T20:53:52+00:00"
},
{
"name": "doctrine/annotations",
@@ -310,7 +309,7 @@
"docblock",
"parser"
],
- "time": "2015-08-31 12:32:49"
+ "time": "2015-08-31T12:32:49+00:00"
},
{
"name": "doctrine/cache",
@@ -380,7 +379,7 @@
"cache",
"caching"
],
- "time": "2015-08-31 12:36:41"
+ "time": "2015-08-31T12:36:41+00:00"
},
{
"name": "doctrine/collections",
@@ -446,7 +445,7 @@
"collections",
"iterator"
],
- "time": "2015-04-14 22:21:58"
+ "time": "2015-04-14T22:21:58+00:00"
},
{
"name": "doctrine/common",
@@ -519,7 +518,7 @@
"persistence",
"spl"
],
- "time": "2015-08-31 13:00:22"
+ "time": "2015-08-31T13:00:22+00:00"
},
{
"name": "doctrine/data-fixtures",
@@ -576,7 +575,7 @@
"keywords": [
"database"
],
- "time": "2015-03-30 12:14:13"
+ "time": "2015-03-30T12:14:13+00:00"
},
{
"name": "doctrine/dbal",
@@ -647,43 +646,45 @@
"persistence",
"queryobject"
],
- "time": "2015-09-16 16:29:33"
+ "time": "2015-09-16T16:29:33+00:00"
},
{
"name": "doctrine/doctrine-bundle",
- "version": "1.6.2",
+ "version": "1.6.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9"
+ "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9",
- "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
+ "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
"shasum": ""
},
"require": {
"doctrine/dbal": "~2.3",
"doctrine/doctrine-cache-bundle": "~1.0",
"jdorn/sql-formatter": "~1.1",
- "php": ">=5.3.2",
- "symfony/console": "~2.3|~3.0",
- "symfony/doctrine-bridge": "~2.2|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0"
+ "php": ">=5.5.9",
+ "symfony/console": "~2.7|~3.0",
+ "symfony/dependency-injection": "~2.7|~3.0",
+ "symfony/doctrine-bridge": "~2.7|~3.0",
+ "symfony/framework-bundle": "~2.7|~3.0"
},
"require-dev": {
"doctrine/orm": "~2.3",
"phpunit/phpunit": "~4",
- "satooshi/php-coveralls": "~0.6.1",
+ "satooshi/php-coveralls": "^1.0",
"symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/validator": "~2.2|~3.0",
- "symfony/yaml": "~2.2|~3.0",
- "twig/twig": "~1.10"
+ "symfony/property-info": "~2.8|~3.0",
+ "symfony/validator": "~2.7|~3.0",
+ "symfony/yaml": "~2.7|~3.0",
+ "twig/twig": "~1.10|~2.0"
},
"suggest": {
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
- "symfony/web-profiler-bundle": "to use the data collector"
+ "symfony/web-profiler-bundle": "To use the data collector."
},
"type": "symfony-bundle",
"extra": {
@@ -726,7 +727,7 @@
"orm",
"persistence"
],
- "time": "2016-01-10 17:21:44"
+ "time": "2017-01-16T12:01:26+00:00"
},
{
"name": "doctrine/doctrine-cache-bundle",
@@ -810,7 +811,7 @@
"cache",
"caching"
],
- "time": "2014-11-28 09:43:36"
+ "time": "2014-11-28T09:43:36+00:00"
},
{
"name": "doctrine/doctrine-fixtures-bundle",
@@ -867,7 +868,7 @@
"Fixture",
"persistence"
],
- "time": "2015-08-04 22:43:14"
+ "time": "2015-08-04T22:43:14+00:00"
},
{
"name": "doctrine/doctrine-migrations-bundle",
@@ -925,7 +926,7 @@
"migrations",
"schema"
],
- "time": "2016-02-15 11:26:08"
+ "time": "2016-02-15T11:26:08+00:00"
},
{
"name": "doctrine/inflector",
@@ -992,7 +993,7 @@
"singularize",
"string"
],
- "time": "2014-12-20 21:24:13"
+ "time": "2014-12-20T21:24:13+00:00"
},
{
"name": "doctrine/instantiator",
@@ -1046,7 +1047,7 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14 21:17:01"
+ "time": "2015-06-14T21:17:01+00:00"
},
{
"name": "doctrine/lexer",
@@ -1100,7 +1101,7 @@
"lexer",
"parser"
],
- "time": "2014-09-09 13:34:57"
+ "time": "2014-09-09T13:34:57+00:00"
},
{
"name": "doctrine/migrations",
@@ -1169,7 +1170,7 @@
"database",
"migrations"
],
- "time": "2016-02-08 09:40:13"
+ "time": "2016-02-08T09:40:13+00:00"
},
{
"name": "doctrine/orm",
@@ -1245,7 +1246,7 @@
"database",
"orm"
],
- "time": "2016-01-05 21:34:58"
+ "time": "2016-01-05T21:34:58+00:00"
},
{
"name": "dunglas/api-bundle",
@@ -1321,7 +1322,7 @@
"json",
"rest"
],
- "time": "2015-09-23 13:09:28"
+ "time": "2015-09-23T13:09:28+00:00"
},
{
"name": "dunglas/php-property-info",
@@ -1376,7 +1377,7 @@
"type",
"validator"
],
- "time": "2015-12-29 08:21:00"
+ "time": "2015-12-29T08:21:00+00:00"
},
{
"name": "escapestudios/wsse-authentication-bundle",
@@ -1384,12 +1385,12 @@
"target-dir": "Escape/WSSEAuthenticationBundle",
"source": {
"type": "git",
- "url": "https://github.com/felicitus/EscapeWSSEAuthenticationBundle.git",
+ "url": "https://github.com/Drachenkaetzchen/EscapeWSSEAuthenticationBundle.git",
"reference": "f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/felicitus/EscapeWSSEAuthenticationBundle/zipball/f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a",
+ "url": "https://api.github.com/repos/Drachenkaetzchen/EscapeWSSEAuthenticationBundle/zipball/f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a",
"reference": "f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a",
"shasum": ""
},
@@ -1436,7 +1437,7 @@
"support": {
"source": "https://github.com/felicitus/EscapeWSSEAuthenticationBundle/tree/PSR3Logging"
},
- "time": "2016-01-03 15:44:13"
+ "time": "2016-01-03T15:44:13+00:00"
},
{
"name": "fortawesome/font-awesome",
@@ -1484,7 +1485,7 @@
"font",
"icon"
],
- "time": "2016-10-24 15:52:54"
+ "time": "2016-10-24T15:52:54+00:00"
},
{
"name": "fr3d/ldap-bundle",
@@ -1542,7 +1543,7 @@
"issues": "https://github.com/Maks3w/FR3DLdapBundle/issues",
"source": "https://github.com/Maks3w/FR3DLdapBundle"
},
- "time": "2015-11-02 22:02:23"
+ "time": "2015-11-02T22:02:23+00:00"
},
{
"name": "friendsofsymfony/rest-bundle",
@@ -1628,7 +1629,7 @@
"keywords": [
"rest"
],
- "time": "2015-12-29 16:02:50"
+ "time": "2015-12-29T16:02:50+00:00"
},
{
"name": "friendsofsymfony/user-bundle",
@@ -1695,7 +1696,7 @@
"keywords": [
"User management"
],
- "time": "2015-09-15 13:15:07"
+ "time": "2015-09-15T13:15:07+00:00"
},
{
"name": "gedmo/doctrine-extensions",
@@ -1774,7 +1775,7 @@
"tree",
"uploadable"
],
- "time": "2016-12-21 13:46:54"
+ "time": "2016-12-21T13:46:54+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -1836,7 +1837,7 @@
"rest",
"web service"
],
- "time": "2016-10-08 15:01:37"
+ "time": "2016-10-08T15:01:37+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1887,7 +1888,7 @@
"keywords": [
"promise"
],
- "time": "2016-12-20 10:07:11"
+ "time": "2016-12-20T10:07:11+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -1945,7 +1946,7 @@
"stream",
"uri"
],
- "time": "2016-06-24 23:00:38"
+ "time": "2016-06-24T23:00:38+00:00"
},
{
"name": "imagine/imagine",
@@ -2002,7 +2003,7 @@
"image manipulation",
"image processing"
],
- "time": "2015-09-19 16:54:05"
+ "time": "2015-09-19T16:54:05+00:00"
},
{
"name": "incenteev/composer-parameter-handler",
@@ -2053,7 +2054,7 @@
"keywords": [
"parameters management"
],
- "time": "2015-11-10 17:04:01"
+ "time": "2015-11-10T17:04:01+00:00"
},
{
"name": "ircmaxell/password-compat",
@@ -2095,7 +2096,7 @@
"hashing",
"password"
],
- "time": "2014-11-20 16:49:30"
+ "time": "2014-11-20T16:49:30+00:00"
},
{
"name": "jdorn/sql-formatter",
@@ -2145,79 +2146,7 @@
"highlight",
"sql"
],
- "time": "2014-01-12 16:20:24"
- },
- {
- "name": "jms/translation-bundle",
- "version": "dev-master",
- "target-dir": "JMS/TranslationBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/schmittjoh/JMSTranslationBundle.git",
- "reference": "8eff56746b73762dfe06414faf0fb609bfe51754"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/8eff56746b73762dfe06414faf0fb609bfe51754",
- "reference": "8eff56746b73762dfe06414faf0fb609bfe51754",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "0.9.4",
- "symfony/console": "*",
- "symfony/framework-bundle": "~2.1"
- },
- "conflict": {
- "twig/twig": "1.10.2"
- },
- "require-dev": {
- "jms/di-extra-bundle": ">=1.1",
- "sensio/framework-extra-bundle": "*",
- "symfony/browser-kit": "*",
- "symfony/class-loader": "*",
- "symfony/css-selector": "*",
- "symfony/finder": "*",
- "symfony/form": "*",
- "symfony/process": "*",
- "symfony/security": "*",
- "symfony/twig-bundle": "*",
- "symfony/validator": "*",
- "symfony/yaml": "*"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "JMS\\TranslationBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache2"
- ],
- "authors": [
- {
- "name": "Johannes M. Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Puts the Symfony2 Translation Component on steroids",
- "homepage": "http://jmsyst.com/bundles/JMSTranslationBundle",
- "keywords": [
- "extract",
- "extraction",
- "i18n",
- "interface",
- "multilanguage",
- "translation",
- "ui",
- "webinterface"
- ],
- "time": "2014-10-29 13:23:47"
+ "time": "2014-01-12T16:20:24+00:00"
},
{
"name": "knplabs/gaufrette",
@@ -2301,7 +2230,7 @@
"filesystem",
"media"
],
- "time": "2016-03-03 09:36:22"
+ "time": "2016-03-03T09:36:22+00:00"
},
{
"name": "knplabs/knp-gaufrette-bundle",
@@ -2359,7 +2288,7 @@
"filesystem",
"media"
],
- "time": "2015-09-18 12:09:25"
+ "time": "2015-09-18T12:09:25+00:00"
},
{
"name": "kriswallsmith/assetic",
@@ -2436,7 +2365,7 @@
"compression",
"minification"
],
- "time": "2016-11-11 18:43:20"
+ "time": "2016-11-11T18:43:20+00:00"
},
{
"name": "michelf/php-markdown",
@@ -2487,7 +2416,7 @@
"keywords": [
"markdown"
],
- "time": "2016-10-29 18:58:20"
+ "time": "2016-10-29T18:58:20+00:00"
},
{
"name": "monolog/monolog",
@@ -2565,7 +2494,7 @@
"logging",
"psr-3"
],
- "time": "2016-11-26 00:15:39"
+ "time": "2016-11-26T00:15:39+00:00"
},
{
"name": "moontoast/math",
@@ -2614,7 +2543,7 @@
"bcmath",
"math"
],
- "time": "2017-02-16 16:54:46"
+ "time": "2017-02-16T16:54:46+00:00"
},
{
"name": "nelmio/api-doc-bundle",
@@ -2694,7 +2623,7 @@
"documentation",
"rest"
],
- "time": "2015-09-30 21:35:45"
+ "time": "2015-09-30T21:35:45+00:00"
},
{
"name": "nfq-alpha/sprite-bundle",
@@ -2738,7 +2667,7 @@
"support": {
"source": "https://github.com/partkeepr/sprite-generator/tree/min-image-fix"
},
- "time": "2016-08-01 15:59:08"
+ "time": "2016-08-01T15:59:08+00:00"
},
{
"name": "nikic/php-parser",
@@ -2782,7 +2711,7 @@
"parser",
"php"
],
- "time": "2013-08-25 17:11:40"
+ "time": "2013-08-25T17:11:40+00:00"
},
{
"name": "ocramius/proxy-manager",
@@ -2845,7 +2774,7 @@
"proxy pattern",
"service proxies"
],
- "time": "2015-08-09 04:28:19"
+ "time": "2015-08-09T04:28:19+00:00"
},
{
"name": "paragonie/random_compat",
@@ -2893,7 +2822,7 @@
"pseudorandom",
"random"
],
- "time": "2016-03-18 20:34:03"
+ "time": "2016-03-18T20:34:03+00:00"
},
{
"name": "partkeepr/extjs6",
@@ -2925,7 +2854,7 @@
"source": "https://github.com/partkeepr/extjs6/tree/master",
"issues": "https://github.com/partkeepr/extjs6/issues"
},
- "time": "2017-01-10 21:51:17"
+ "time": "2017-01-10T21:51:17+00:00"
},
{
"name": "partkeepr/remote-file-loader",
@@ -2979,7 +2908,7 @@
"source": "https://github.com/felicitus/remote-file-loader/tree/master",
"issues": "https://github.com/felicitus/remote-file-loader/issues"
},
- "time": "2015-09-30 13:47:50"
+ "time": "2015-09-30T13:47:50+00:00"
},
{
"name": "phpdocumentor/reflection",
@@ -3033,7 +2962,7 @@
"reflection",
"static analysis"
],
- "time": "2014-11-14 11:43:04"
+ "time": "2014-11-14T11:43:04+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -3082,7 +3011,7 @@
"email": "mike.vanriel@naenius.com"
}
],
- "time": "2015-02-03 12:10:50"
+ "time": "2015-02-03T12:10:50+00:00"
},
{
"name": "phpseclib/phpseclib",
@@ -3174,7 +3103,7 @@
"x.509",
"x509"
],
- "time": "2017-05-08 05:58:35"
+ "time": "2017-05-08T05:58:35+00:00"
},
{
"name": "predis/predis",
@@ -3224,7 +3153,7 @@
"predis",
"redis"
],
- "time": "2016-06-16 16:22:20"
+ "time": "2016-06-16T16:22:20+00:00"
},
{
"name": "psr/http-message",
@@ -3274,7 +3203,7 @@
"request",
"response"
],
- "time": "2016-08-06 14:39:51"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
@@ -3312,7 +3241,7 @@
"psr",
"psr-3"
],
- "time": "2012-12-21 11:40:51"
+ "time": "2012-12-21T11:40:51+00:00"
},
{
"name": "ramsey/uuid",
@@ -3394,7 +3323,7 @@
"identifier",
"uuid"
],
- "time": "2016-11-22 19:21:44"
+ "time": "2016-11-22T19:21:44+00:00"
},
{
"name": "reputation-vip/composer-assets-installer",
@@ -3434,7 +3363,7 @@
"email": "ap@reputationvip.com"
}
],
- "time": "2015-03-09 10:29:42"
+ "time": "2015-03-09T10:29:42+00:00"
},
{
"name": "sensio/distribution-bundle",
@@ -3494,7 +3423,7 @@
"configuration",
"distribution"
],
- "time": "2017-01-04 13:34:44"
+ "time": "2017-01-04T13:34:44+00:00"
},
{
"name": "sensio/framework-extra-bundle",
@@ -3564,7 +3493,7 @@
"annotations",
"controllers"
],
- "time": "2017-02-15 06:52:30"
+ "time": "2017-02-15T06:52:30+00:00"
},
{
"name": "sensiolabs/security-checker",
@@ -3608,7 +3537,7 @@
}
],
"description": "A security checker for your composer.lock",
- "time": "2015-11-07 08:07:40"
+ "time": "2015-11-07T08:07:40+00:00"
},
{
"name": "snc/redis-bundle",
@@ -3668,7 +3597,7 @@
"redis",
"symfony"
],
- "time": "2016-01-21 18:29:37"
+ "time": "2016-01-21T18:29:37+00:00"
},
{
"name": "sonata-project/exporter",
@@ -3737,7 +3666,7 @@
"export",
"xls"
],
- "time": "2017-02-09 16:39:40"
+ "time": "2017-02-09T16:39:40+00:00"
},
{
"name": "stof/doctrine-extensions-bundle",
@@ -3798,7 +3727,7 @@
"translatable",
"tree"
],
- "time": "2016-01-26 23:58:32"
+ "time": "2016-01-26T23:58:32+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -3852,24 +3781,24 @@
"mail",
"mailer"
],
- "time": "2017-02-13 07:52:53"
+ "time": "2017-02-13T07:52:53+00:00"
},
{
"name": "symfony/assetic-bundle",
- "version": "v2.7.1",
+ "version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/assetic-bundle.git",
- "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76"
+ "reference": "2e0a23a4874838e26de6f025e02fc63328921a4c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76",
- "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76",
+ "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/2e0a23a4874838e26de6f025e02fc63328921a4c",
+ "reference": "2e0a23a4874838e26de6f025e02fc63328921a4c",
"shasum": ""
},
"require": {
- "kriswallsmith/assetic": "~1.3",
+ "kriswallsmith/assetic": "~1.4",
"php": ">=5.3.0",
"symfony/console": "~2.3|~3.0",
"symfony/dependency-injection": "~2.3|~3.0",
@@ -3878,7 +3807,7 @@
},
"conflict": {
"kriswallsmith/spork": "<=0.2",
- "twig/twig": "<1.20"
+ "twig/twig": "<1.27"
},
"require-dev": {
"kriswallsmith/spork": "~0.3",
@@ -3896,7 +3825,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
@@ -3922,7 +3851,7 @@
"compression",
"minification"
],
- "time": "2015-11-17 09:45:47"
+ "time": "2017-07-14T07:26:46+00:00"
},
{
"name": "symfony/monolog-bundle",
@@ -3981,7 +3910,7 @@
"log",
"logging"
],
- "time": "2015-11-17 10:02:29"
+ "time": "2015-11-17T10:02:29+00:00"
},
{
"name": "symfony/polyfill-apcu",
@@ -4034,7 +3963,7 @@
"portable",
"shim"
],
- "time": "2016-11-14 01:06:16"
+ "time": "2016-11-14T01:06:16+00:00"
},
{
"name": "symfony/polyfill-intl-icu",
@@ -4089,29 +4018,32 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-04T20:28:58+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.0.0",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "0b6a8940385311a24e060ec1fe35680e17c74497"
+ "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497",
- "reference": "0b6a8940385311a24e060ec1fe35680e17c74497",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+ "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -4145,7 +4077,7 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2018-01-30T19:27:44+00:00"
},
{
"name": "symfony/polyfill-php54",
@@ -4203,7 +4135,7 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-04T20:28:58+00:00"
},
{
"name": "symfony/polyfill-php55",
@@ -4259,7 +4191,7 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-04T20:28:58+00:00"
},
{
"name": "symfony/polyfill-php56",
@@ -4315,7 +4247,7 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-04T20:28:58+00:00"
},
{
"name": "symfony/polyfill-php70",
@@ -4374,7 +4306,7 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-04T20:28:58+00:00"
},
{
"name": "symfony/polyfill-util",
@@ -4426,7 +4358,7 @@
"polyfill",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-04T20:28:58+00:00"
},
{
"name": "symfony/security-acl",
@@ -4487,7 +4419,7 @@
],
"description": "Symfony Security Component - ACL (Access Control List)",
"homepage": "https://symfony.com",
- "time": "2015-12-28 09:39:09"
+ "time": "2015-12-28T09:39:09+00:00"
},
{
"name": "symfony/swiftmailer-bundle",
@@ -4546,24 +4478,25 @@
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
- "time": "2016-12-20 04:44:33"
+ "time": "2016-12-20T04:44:33+00:00"
},
{
"name": "symfony/symfony",
- "version": "v2.8.16",
+ "version": "v2.8.38",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "9fef72a3ab561c4bfa703a70369db028dec387d2"
+ "reference": "481883d56cbd4f435466dc26648d5c735671dd58"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/9fef72a3ab561c4bfa703a70369db028dec387d2",
- "reference": "9fef72a3ab561c4bfa703a70369db028dec387d2",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/481883d56cbd4f435466dc26648d5c735671dd58",
+ "reference": "481883d56cbd4f435466dc26648d5c735671dd58",
"shasum": ""
},
"require": {
"doctrine/common": "~2.4",
+ "ext-xml": "*",
"php": ">=5.3.9",
"psr/log": "~1.0",
"symfony/polyfill-apcu": "~1.1",
@@ -4575,10 +4508,11 @@
"symfony/polyfill-php70": "~1.0",
"symfony/polyfill-util": "~1.0",
"symfony/security-acl": "~2.7|~3.0.0",
- "twig/twig": "~1.28|~2.0"
+ "twig/twig": "~1.34|~2.4"
},
"conflict": {
- "phpdocumentor/reflection": "<1.0.7"
+ "phpdocumentor/reflection": "<1.0.7",
+ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},
"replace": {
"symfony/asset": "self.version",
@@ -4629,6 +4563,7 @@
"symfony/yaml": "self.version"
},
"require-dev": {
+ "doctrine/annotations": "~1.0",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4",
"doctrine/doctrine-bundle": "~1.2",
@@ -4637,7 +4572,8 @@
"monolog/monolog": "~1.11",
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
"phpdocumentor/reflection": "^1.0.7",
- "symfony/phpunit-bridge": "~3.2"
+ "sensio/framework-extra-bundle": "^3.0.2",
+ "symfony/phpunit-bridge": "~3.4|~4.0"
},
"type": "library",
"extra": {
@@ -4681,7 +4617,7 @@
"keywords": [
"framework"
],
- "time": "2017-01-12 20:27:46"
+ "time": "2018-04-06T14:52:23+00:00"
},
{
"name": "twig/extensions",
@@ -4733,38 +4669,42 @@
"i18n",
"text"
],
- "time": "2016-10-25 17:34:14"
+ "time": "2016-10-25T17:34:14+00:00"
},
{
"name": "twig/twig",
- "version": "v1.31.0",
+ "version": "v1.35.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7"
+ "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
- "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
+ "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"shasum": ""
},
"require": {
- "php": ">=5.2.7"
+ "php": ">=5.3.3"
},
"require-dev": {
- "symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~3.2"
+ "psr/container": "^1.0",
+ "symfony/debug": "^2.7",
+ "symfony/phpunit-bridge": "^3.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.31-dev"
+ "dev-master": "1.35-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
+ },
+ "psr-4": {
+ "Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -4794,7 +4734,7 @@
"keywords": [
"templating"
],
- "time": "2017-01-11 19:36:15"
+ "time": "2018-03-20T04:25:58+00:00"
},
{
"name": "willdurand/jsonp-callback-validator",
@@ -4834,7 +4774,7 @@
}
],
"description": "JSONP callback validator.",
- "time": "2014-01-20 22:35:06"
+ "time": "2014-01-20T22:35:06+00:00"
},
{
"name": "willdurand/negotiation",
@@ -4883,7 +4823,7 @@
"header",
"negotiation"
],
- "time": "2015-10-01 07:42:40"
+ "time": "2015-10-01T07:42:40+00:00"
},
{
"name": "zendframework/zend-code",
@@ -4936,7 +4876,7 @@
"code",
"zf2"
],
- "time": "2015-07-21 22:40:59"
+ "time": "2015-07-21T22:40:59+00:00"
},
{
"name": "zendframework/zend-eventmanager",
@@ -4981,7 +4921,7 @@
"eventmanager",
"zf2"
],
- "time": "2015-07-16 19:00:49"
+ "time": "2015-07-16T19:00:49+00:00"
},
{
"name": "zendframework/zend-hydrator",
@@ -5037,7 +4977,7 @@
"hydrator",
"zf2"
],
- "time": "2015-09-17 14:06:43"
+ "time": "2015-09-17T14:06:43+00:00"
},
{
"name": "zendframework/zend-ldap",
@@ -5089,7 +5029,7 @@
"ldap",
"zf2"
],
- "time": "2015-06-03 15:32:02"
+ "time": "2015-06-03T15:32:02+00:00"
},
{
"name": "zendframework/zend-stdlib",
@@ -5147,7 +5087,7 @@
"stdlib",
"zf2"
],
- "time": "2015-09-25 04:06:33"
+ "time": "2015-09-25T04:06:33+00:00"
}
],
"packages-dev": [
@@ -5207,7 +5147,7 @@
"codeclimate",
"coverage"
],
- "time": "2015-12-17 00:52:54"
+ "time": "2015-12-17T00:52:54+00:00"
},
{
"name": "ddeboer/data-import",
@@ -5276,7 +5216,7 @@
"export",
"import"
],
- "time": "2015-04-21 14:06:20"
+ "time": "2015-04-21T14:06:20+00:00"
},
{
"name": "guzzle/guzzle",
@@ -5372,7 +5312,7 @@
"web service"
],
"abandoned": "guzzlehttp/guzzle",
- "time": "2015-03-18 18:23:50"
+ "time": "2015-03-18T18:23:50+00:00"
},
{
"name": "liip/functional-test-bundle",
@@ -5450,7 +5390,7 @@
"keywords": [
"Symfony2"
],
- "time": "2017-01-11 18:04:59"
+ "time": "2017-01-11T18:04:59+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -5492,7 +5432,7 @@
"object",
"object graph"
],
- "time": "2017-01-26 22:05:40"
+ "time": "2017-01-26T22:05:40+00:00"
},
{
"name": "phpspec/prophecy",
@@ -5555,44 +5495,44 @@
"spy",
"stub"
],
- "time": "2016-11-21 14:58:47"
+ "time": "2016-11-21T14:58:47+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "3.3.3",
+ "version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5"
+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/44cd8e3930e431658d1a5de7d282d5cb37837fd5",
- "reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"shasum": ""
},
"require": {
+ "ext-dom": "*",
+ "ext-xmlwriter": "*",
"php": "^5.6 || ^7.0",
- "phpunit/php-file-iterator": "~1.3",
- "phpunit/php-text-template": "~1.2",
- "phpunit/php-token-stream": "^1.4.2",
- "sebastian/code-unit-reverse-lookup": "~1.0",
- "sebastian/environment": "^1.3.2",
- "sebastian/version": "~1.0|~2.0"
+ "phpunit/php-file-iterator": "^1.3",
+ "phpunit/php-text-template": "^1.2",
+ "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+ "sebastian/code-unit-reverse-lookup": "^1.0",
+ "sebastian/environment": "^1.3.2 || ^2.0",
+ "sebastian/version": "^1.0 || ^2.0"
},
"require-dev": {
- "ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "~5"
+ "ext-xdebug": "^2.1.4",
+ "phpunit/phpunit": "^5.7"
},
"suggest": {
- "ext-dom": "*",
- "ext-xdebug": ">=2.4.0",
- "ext-xmlwriter": "*"
+ "ext-xdebug": "^2.5.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -5618,7 +5558,7 @@
"testing",
"xunit"
],
- "time": "2016-05-27 16:24:29"
+ "time": "2017-04-02T07:44:40+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -5665,7 +5605,7 @@
"filesystem",
"iterator"
],
- "time": "2016-10-03 07:40:28"
+ "time": "2016-10-03T07:40:28+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -5706,7 +5646,7 @@
"keywords": [
"template"
],
- "time": "2015-06-21 13:50:34"
+ "time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
@@ -5750,7 +5690,7 @@
"keywords": [
"timer"
],
- "time": "2016-05-12 18:03:57"
+ "time": "2016-05-12T18:03:57+00:00"
},
{
"name": "phpunit/php-token-stream",
@@ -5799,20 +5739,20 @@
"keywords": [
"tokenizer"
],
- "time": "2016-11-15 14:06:22"
+ "time": "2016-11-15T14:06:22+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "5.2.0",
+ "version": "5.5.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "d5a3df263ea4fda53d15d5dd7446d2d5f86543e4"
+ "reference": "c7b3e1dcc1d183f26d5ba282881fe65c2cbb5b2b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d5a3df263ea4fda53d15d5dd7446d2d5f86543e4",
- "reference": "d5a3df263ea4fda53d15d5dd7446d2d5f86543e4",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c7b3e1dcc1d183f26d5ba282881fe65c2cbb5b2b",
+ "reference": "c7b3e1dcc1d183f26d5ba282881fe65c2cbb5b2b",
"shasum": ""
},
"require": {
@@ -5822,22 +5762,26 @@
"ext-reflection": "*",
"ext-spl": "*",
"myclabs/deep-copy": "~1.3",
- "php": ">=5.6",
+ "php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "~3.1",
+ "phpunit/php-code-coverage": "^4.0.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
- "phpunit/php-timer": ">=1.0.6",
- "phpunit/phpunit-mock-objects": ">=3.0.5",
+ "phpunit/php-timer": "^1.0.6",
+ "phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
- "sebastian/environment": "~1.3",
+ "sebastian/environment": "^1.3 || ^2.0",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
+ "sebastian/object-enumerator": "~1.0",
"sebastian/resource-operations": "~1.0",
- "sebastian/version": "~2.0",
+ "sebastian/version": "~1.0|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "3.0.2"
+ },
"suggest": {
"phpunit/php-invoker": "~1.1"
},
@@ -5847,7 +5791,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.2.x-dev"
+ "dev-master": "5.5.x-dev"
}
},
"autoload": {
@@ -5873,30 +5817,33 @@
"testing",
"xunit"
],
- "time": "2016-02-04 13:12:44"
+ "time": "2016-08-05T04:49:02+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "3.1.3",
+ "version": "3.4.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "151c96874bff6fe61a25039df60e776613a61489"
+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/151c96874bff6fe61a25039df60e776613a61489",
- "reference": "151c96874bff6fe61a25039df60e776613a61489",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118",
+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
- "php": ">=5.6",
- "phpunit/php-text-template": "~1.2",
- "sebastian/exporter": "~1.2"
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-text-template": "^1.2",
+ "sebastian/exporter": "^1.2 || ^2.0"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "~5"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-soap": "*"
@@ -5904,7 +5851,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev"
+ "dev-master": "3.2.x-dev"
}
},
"autoload": {
@@ -5929,7 +5876,7 @@
"mock",
"xunit"
],
- "time": "2016-04-20 14:39:26"
+ "time": "2017-06-30T09:13:00+00:00"
},
{
"name": "satooshi/php-coveralls",
@@ -5997,7 +5944,7 @@
"github",
"test"
],
- "time": "2013-05-04 08:07:33"
+ "time": "2013-05-04T08:07:33+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -6042,7 +5989,7 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2016-02-13 06:45:14"
+ "time": "2016-02-13T06:45:14+00:00"
},
{
"name": "sebastian/comparator",
@@ -6106,7 +6053,7 @@
"compare",
"equality"
],
- "time": "2017-01-29 09:50:25"
+ "time": "2017-01-29T09:50:25+00:00"
},
{
"name": "sebastian/diff",
@@ -6158,7 +6105,7 @@
"keywords": [
"diff"
],
- "time": "2015-12-08 07:14:41"
+ "time": "2015-12-08T07:14:41+00:00"
},
{
"name": "sebastian/environment",
@@ -6208,7 +6155,7 @@
"environment",
"hhvm"
],
- "time": "2016-08-18 05:49:44"
+ "time": "2016-08-18T05:49:44+00:00"
},
{
"name": "sebastian/exporter",
@@ -6275,7 +6222,7 @@
"export",
"exporter"
],
- "time": "2016-06-17 09:04:28"
+ "time": "2016-06-17T09:04:28+00:00"
},
{
"name": "sebastian/global-state",
@@ -6326,7 +6273,53 @@
"keywords": [
"global state"
],
- "time": "2015-10-12 03:26:01"
+ "time": "2015-10-12T03:26:01+00:00"
+ },
+ {
+ "name": "sebastian/object-enumerator",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+ "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
+ "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6",
+ "sebastian/recursion-context": "~1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+ "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+ "time": "2016-01-28T13:25:10+00:00"
},
{
"name": "sebastian/recursion-context",
@@ -6379,7 +6372,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2015-11-11 19:50:13"
+ "time": "2015-11-11T19:50:13+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -6421,7 +6414,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28 20:34:47"
+ "time": "2015-07-28T20:34:47+00:00"
},
{
"name": "sebastian/version",
@@ -6464,7 +6457,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03 07:35:21"
+ "time": "2016-10-03T07:35:21+00:00"
},
{
"name": "sensio/generator-bundle",
@@ -6512,7 +6505,7 @@
}
],
"description": "This bundle generates code for you",
- "time": "2015-03-17 06:36:52"
+ "time": "2015-03-17T06:36:52+00:00"
}
],
"aliases": [],
@@ -6527,7 +6520,6 @@
"stof/doctrine-extensions-bundle": 20,
"friendsofsymfony/user-bundle": 20,
"escapestudios/wsse-authentication-bundle": 20,
- "jms/translation-bundle": 20,
"partkeepr/remote-file-loader": 20,
"nfq-alpha/sprite-bundle": 20,
"codeclimate/php-test-reporter": 20
diff --git a/src/PartKeepr/CoreBundle/Resources/translations/messages.en.xliff b/src/PartKeepr/CoreBundle/Resources/translations/messages.en.xliff
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
- <file date="2015-09-25T20:55:15Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
- <header>
- <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
- <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
- </header>
- <body>
- <trans-unit id="c60d0be4a6d13d58629c314ab4b4e749f3b23be8" resname="New PartKeepr Version %version% available">
- <source>New PartKeepr Version %version% available</source>
- <target state="new">New PartKeepr Version %version% available</target>
- <jms:reference-file line="79">CoreBundle/Services/VersionService.php</jms:reference-file>
- </trans-unit>
- <trans-unit id="275816cccab9cb722a0bb1d3b853ff859499baa5" resname="PartKeepr Version %version% changelog:">
- <source>PartKeepr Version %version% changelog:</source>
- <target state="new">PartKeepr Version %version% changelog:</target>
- <jms:reference-file line="81">CoreBundle/Services/VersionService.php</jms:reference-file>
- </trans-unit>
- </body>
- </file>
-</xliff>
diff --git a/src/PartKeepr/FrontendBundle/Controller/IndexController.php b/src/PartKeepr/FrontendBundle/Controller/IndexController.php
@@ -75,10 +75,27 @@ class IndexController extends Controller
$renderParams = [];
$renderParams['parameters'] = $aParameters;
$renderParams['debug'] = $this->get('kernel')->isDebug();
+ $renderParams['baseUrl'] = $this->getBaseURL();
return $renderParams;
}
+ /**
+ * Returns the base_url, either from the router (default) or overridden by the
+ * partkeepr.frontend.base_url parameter.
+ *
+ * @return string
+ */
+ public function getBaseURL () {
+ $baseUrl = $this->getParameterWithDefault('partkeepr.frontend.base_url', false);
+
+ if ($baseUrl !== false) {
+ return $baseUrl;
+ }
+
+ return $this->container->get('router')->getContext()->getBaseUrl();
+ }
+
public function getParameterWithDefault($name, $default)
{
if ($this->container->hasParameter($name)) {
diff --git a/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig b/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>PartKeepr</title>
- <base href="{{ app.request.getBaseURL() }}"/>
+ <base href="{{ baseUrl }}"/>
{% set themes = {"classic": "Classic", "crisp":"Crisp", "crisp-touch": "Crisp Touch", "gray":"Gray", "neptune": "Neptune", "neptune-touch": "Neptune Touch", "triton": "Triton", "aria": "Aria"} %}
{% set defaultTheme = "classic" %}
@@ -14,8 +14,8 @@
{% set themeUri %}js/packages/extjs6/build/classic/theme-{{ defaultTheme }}/resources/theme-{{ defaultTheme }}-all.css{% endset %}
{% set themeUxUri %}js/packages/extjs6/build/packages/ux/classic/{{ defaultTheme }}/resources/ux-all.css{% endset %}
- <link id="theme" rel="stylesheet" href="{{ asset(themeUri) }}"/>
- <link id="themeUx" rel="stylesheet" href="{{ asset(themeUxUri) }}"/>
+ <link id="theme" rel="stylesheet" href="{{ asset('' ~ themeUri) }}"/>
+ <link id="themeUx" rel="stylesheet" href="{{ asset('' ~ themeUxUri) }}"/>
<!-- Include the ExtJS CSS Theme -->
{% stylesheets
@@ -364,8 +364,8 @@
{% set themeUxUri %}js/packages/extjs6/build/packages/ux/classic/{{ themeId }}/resources/ux-all.css{% endset %}
window.themes["{{ themeId }}"] = {
- themeUri: '{{ asset(themeUri) }}',
- themeUxUri: '{{ asset(themeUxUri) }}',
+ themeUri: '{{ asset('' ~ themeUri) }}',
+ themeUxUri: '{{ asset('' ~ themeUxUri) }}',
themeName: '{{ themeName }}'
};
{% endfor %}
