Julio Montoya 12 роки тому
батько
коміт
3015eb9afa
100 змінених файлів з 651 додано та 563 видалено
  1. 1 1
      vendor/autoload.php
  2. 3 3
      vendor/composer/autoload_real.php
  3. 314 313
      vendor/composer/installed.json
  4. 4 0
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Uploadable/UploadableListener.php
  5. 2 1
      vendor/igorw/config-service-provider/README.md
  6. 1 1
      vendor/leafo/lessphp
  7. 1 1
      vendor/mheap/silex-assetic
  8. 2 1
      vendor/silex/silex/composer.json
  9. 2 2
      vendor/silex/silex/src/Silex/Provider/MonologServiceProvider.php
  10. 21 21
      vendor/symfony/console/Symfony/Component/Console/Application.php
  11. 10 0
      vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php
  12. 5 1
      vendor/symfony/security/Symfony/Component/Security/Acl/Dbal/AclProvider.php
  13. 17 0
      vendor/symfony/security/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php
  14. 9 1
      vendor/twig/twig/CHANGELOG
  15. 45 0
      vendor/twig/twig/doc/filters/batch.rst
  16. 21 20
      vendor/twig/twig/doc/filters/index.rst
  17. 3 1
      vendor/twig/twig/doc/filters/json_encode.rst
  18. 1 1
      vendor/twig/twig/doc/filters/merge.rst
  19. 1 1
      vendor/twig/twig/doc/filters/sort.rst
  20. 1 1
      vendor/twig/twig/doc/filters/striptags.rst
  21. 12 3
      vendor/twig/twig/doc/filters/url_encode.rst
  22. 7 7
      vendor/twig/twig/doc/functions/index.rst
  23. 15 0
      vendor/twig/twig/doc/tags/for.rst
  24. 12 12
      vendor/twig/twig/doc/tags/index.rst
  25. 5 5
      vendor/twig/twig/doc/tests/index.rst
  26. 1 1
      vendor/twig/twig/ext/twig/php_twig.h
  27. 3 0
      vendor/twig/twig/ext/twig/twig.c
  28. 1 2
      vendor/twig/twig/lib/Twig/Autoloader.php
  29. 1 2
      vendor/twig/twig/lib/Twig/Compiler.php
  30. 1 2
      vendor/twig/twig/lib/Twig/CompilerInterface.php
  31. 16 17
      vendor/twig/twig/lib/Twig/Environment.php
  32. 1 2
      vendor/twig/twig/lib/Twig/Error.php
  33. 1 2
      vendor/twig/twig/lib/Twig/Error/Loader.php
  34. 1 2
      vendor/twig/twig/lib/Twig/Error/Runtime.php
  35. 1 2
      vendor/twig/twig/lib/Twig/Error/Syntax.php
  36. 1 2
      vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
  37. 1 2
      vendor/twig/twig/lib/Twig/ExpressionParser.php
  38. 40 5
      vendor/twig/twig/lib/Twig/Extension/Core.php
  39. 1 2
      vendor/twig/twig/lib/Twig/Extension/Staging.php
  40. 1 2
      vendor/twig/twig/lib/Twig/ExtensionInterface.php
  41. 1 2
      vendor/twig/twig/lib/Twig/Filter.php
  42. 1 2
      vendor/twig/twig/lib/Twig/Filter/Function.php
  43. 1 2
      vendor/twig/twig/lib/Twig/Filter/Method.php
  44. 1 2
      vendor/twig/twig/lib/Twig/Filter/Node.php
  45. 1 2
      vendor/twig/twig/lib/Twig/FilterCallableInterface.php
  46. 1 2
      vendor/twig/twig/lib/Twig/FilterInterface.php
  47. 1 2
      vendor/twig/twig/lib/Twig/Function.php
  48. 1 2
      vendor/twig/twig/lib/Twig/Function/Function.php
  49. 1 2
      vendor/twig/twig/lib/Twig/Function/Method.php
  50. 1 2
      vendor/twig/twig/lib/Twig/Function/Node.php
  51. 1 2
      vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
  52. 1 2
      vendor/twig/twig/lib/Twig/FunctionInterface.php
  53. 5 3
      vendor/twig/twig/lib/Twig/Lexer.php
  54. 1 2
      vendor/twig/twig/lib/Twig/LexerInterface.php
  55. 1 2
      vendor/twig/twig/lib/Twig/Loader/Array.php
  56. 1 2
      vendor/twig/twig/lib/Twig/Loader/Chain.php
  57. 2 2
      vendor/twig/twig/lib/Twig/Loader/Filesystem.php
  58. 1 2
      vendor/twig/twig/lib/Twig/Loader/String.php
  59. 1 2
      vendor/twig/twig/lib/Twig/LoaderInterface.php
  60. 1 2
      vendor/twig/twig/lib/Twig/Markup.php
  61. 1 2
      vendor/twig/twig/lib/Twig/Node.php
  62. 1 2
      vendor/twig/twig/lib/Twig/Node/AutoEscape.php
  63. 1 2
      vendor/twig/twig/lib/Twig/Node/Block.php
  64. 1 2
      vendor/twig/twig/lib/Twig/Node/BlockReference.php
  65. 1 2
      vendor/twig/twig/lib/Twig/Node/Body.php
  66. 1 2
      vendor/twig/twig/lib/Twig/Node/Do.php
  67. 1 2
      vendor/twig/twig/lib/Twig/Node/Embed.php
  68. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression.php
  69. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
  70. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
  71. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
  72. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
  73. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
  74. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
  75. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
  76. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
  77. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
  78. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
  79. 1 2
      vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
  80. 1 2
      vendor/twig/twig/lib/Twig/Node/Flush.php
  81. 1 2
      vendor/twig/twig/lib/Twig/Node/For.php
  82. 1 2
      vendor/twig/twig/lib/Twig/Node/ForLoop.php
  83. 1 2
      vendor/twig/twig/lib/Twig/Node/If.php
  84. 1 2
      vendor/twig/twig/lib/Twig/Node/Import.php
  85. 1 2
      vendor/twig/twig/lib/Twig/Node/Include.php
  86. 1 2
      vendor/twig/twig/lib/Twig/Node/Macro.php
  87. 1 2
      vendor/twig/twig/lib/Twig/Node/Module.php
  88. 1 2
      vendor/twig/twig/lib/Twig/Node/Print.php
  89. 1 2
      vendor/twig/twig/lib/Twig/Node/Sandbox.php
  90. 1 2
      vendor/twig/twig/lib/Twig/Node/SandboxedModule.php
  91. 1 2
      vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
  92. 1 2
      vendor/twig/twig/lib/Twig/Node/Set.php
  93. 1 2
      vendor/twig/twig/lib/Twig/Node/Spaceless.php
  94. 1 2
      vendor/twig/twig/lib/Twig/Node/Text.php
  95. 1 2
      vendor/twig/twig/lib/Twig/NodeInterface.php
  96. 1 2
      vendor/twig/twig/lib/Twig/NodeOutputInterface.php
  97. 1 2
      vendor/twig/twig/lib/Twig/NodeTraverser.php
  98. 1 2
      vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
  99. 1 2
      vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
  100. 1 2
      vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php

+ 1 - 1
vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitf1f9608edcbd6c22e14fedd1e63ece89::getLoader();
+return ComposerAutoloaderInit37706484f3a2b0c46ed15b8f7158ab3f::getLoader();

+ 3 - 3
vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php generated by Composer
 
-class ComposerAutoloaderInitf1f9608edcbd6c22e14fedd1e63ece89
+class ComposerAutoloaderInit37706484f3a2b0c46ed15b8f7158ab3f
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitf1f9608edcbd6c22e14fedd1e63ece89
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitf1f9608edcbd6c22e14fedd1e63ece89', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit37706484f3a2b0c46ed15b8f7158ab3f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitf1f9608edcbd6c22e14fedd1e63ece89', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit37706484f3a2b0c46ed15b8f7158ab3f', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);

+ 314 - 313
vendor/composer/installed.json

@@ -110,57 +110,6 @@
             "psr-3"
         ]
     },
-    {
-        "name": "twig/twig",
-        "version": "v1.12.2",
-        "version_normalized": "1.12.2.0",
-        "source": {
-            "type": "git",
-            "url": "git://github.com/fabpot/Twig.git",
-            "reference": "v1.12.2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.2",
-            "reference": "v1.12.2",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.4"
-        },
-        "time": "2013-02-09 18:21:53",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.12-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Twig_": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com"
-            }
-        ],
-        "description": "Twig, the flexible, fast, and secure template language for PHP",
-        "homepage": "http://twig.sensiolabs.org",
-        "keywords": [
-            "templating"
-        ]
-    },
     {
         "name": "swiftmailer/swiftmailer",
         "version": "v4.1.8",
@@ -1013,63 +962,6 @@
             "silex"
         ]
     },
-    {
-        "name": "igorw/config-service-provider",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/igorw/ConfigServiceProvider.git",
-            "reference": "v1.1.5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/igorw/ConfigServiceProvider/zipball/v1.1.5",
-            "reference": "v1.1.5",
-            "shasum": ""
-        },
-        "require": {
-            "silex/silex": "1.0.*@dev"
-        },
-        "require-dev": {
-            "symfony/yaml": ">=2.1,<3.0"
-        },
-        "suggest": {
-            "symfony/yaml": "~2.1"
-        },
-        "time": "2013-03-09 15:35:23",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Igorw\\Silex": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Igor Wiedler",
-                "email": "igor@wiedler.ch",
-                "homepage": "http://wiedler.ch/igor/"
-            },
-            {
-                "name": "Contributors",
-                "homepage": "https://github.com/igorw/ConfigServiceProvider/contributors"
-            }
-        ],
-        "description": "A config ServiceProvider for Silex with support for php, json and yaml.",
-        "keywords": [
-            "silex"
-        ]
-    },
     {
         "name": "symfony/property-access",
         "version": "dev-master",
@@ -1341,89 +1233,6 @@
         },
         "notification-url": "https://packagist.org/downloads/"
     },
-    {
-        "name": "silex/silex",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fabpot/Silex.git",
-            "reference": "31139babedb2a4f504737d1d8c5255fca102dae2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fabpot/Silex/zipball/31139babedb2a4f504737d1d8c5255fca102dae2",
-            "reference": "31139babedb2a4f504737d1d8c5255fca102dae2",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "pimple/pimple": "1.*",
-            "symfony/event-dispatcher": ">=2.1,<2.3-dev",
-            "symfony/http-foundation": ">=2.1,<2.3-dev",
-            "symfony/http-kernel": ">=2.1,<2.3-dev",
-            "symfony/routing": ">=2.1,<2.3-dev"
-        },
-        "require-dev": {
-            "doctrine/dbal": ">=2.2.0,<2.4.0-dev",
-            "swiftmailer/swiftmailer": "4.2.*",
-            "symfony/browser-kit": ">=2.1,<2.3-dev",
-            "symfony/config": ">=2.1,<2.3-dev",
-            "symfony/css-selector": ">=2.1,<2.3-dev",
-            "symfony/dom-crawler": ">=2.1,<2.3-dev",
-            "symfony/finder": ">=2.1,<2.3-dev",
-            "symfony/form": ">=2.1.4,<2.3-dev",
-            "symfony/locale": ">=2.1,<2.3-dev",
-            "symfony/monolog-bridge": ">=2.1,<2.3-dev",
-            "symfony/options-resolver": ">=2.1,<2.3-dev",
-            "symfony/process": ">=2.1,<2.3-dev",
-            "symfony/security": ">=2.1,<2.3-dev",
-            "symfony/serializer": ">=2.1,<2.3-dev",
-            "symfony/translation": ">=2.1,<2.3-dev",
-            "symfony/twig-bridge": ">=2.1,<2.3-dev",
-            "symfony/validator": ">=2.1,<2.3-dev",
-            "twig/twig": ">=1.8.0,<2.0-dev"
-        },
-        "suggest": {
-            "symfony/browser-kit": ">=2.1,<2.3-dev",
-            "symfony/css-selector": ">=2.1,<2.3-dev",
-            "symfony/dom-crawler": ">=2.1,<2.3-dev",
-            "symfony/form": "To make use of the FormServiceProvider, >= 2.1.4 is required"
-        },
-        "time": "2013-04-03 19:59:11",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Silex": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Igor Wiedler",
-                "email": "igor@wiedler.ch",
-                "homepage": "http://wiedler.ch/igor/"
-            }
-        ],
-        "description": "The PHP micro-framework based on the Symfony2 Components",
-        "homepage": "http://silex.sensiolabs.org",
-        "keywords": [
-            "microframework"
-        ]
-    },
     {
         "name": "symfony/config",
         "version": "dev-master",
@@ -1603,74 +1412,6 @@
         "description": "Symfony Doctrine Bridge",
         "homepage": "http://symfony.com"
     },
-    {
-        "name": "symfony/security",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Component/Security",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/Security.git",
-            "reference": "cfa23578e55c43c20a8d823bf9a01ed08bcde1d5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Security/zipball/cfa23578e55c43c20a8d823bf9a01ed08bcde1d5",
-            "reference": "cfa23578e55c43c20a8d823bf9a01ed08bcde1d5",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "symfony/event-dispatcher": ">=2.1,<3.0",
-            "symfony/http-foundation": ">=2.1,<2.4-dev",
-            "symfony/http-kernel": ">=2.1,<=2.3-dev"
-        },
-        "require-dev": {
-            "doctrine/common": ">=2.2,<3.0",
-            "doctrine/dbal": ">=2.2,<3.0",
-            "psr/log": ">=1.0,<2.0",
-            "symfony/form": ">=2.0,<3.0",
-            "symfony/routing": ">=2.2,<2.4-dev",
-            "symfony/validator": ">=2.2,<2.4-dev"
-        },
-        "suggest": {
-            "doctrine/dbal": "to use the built-in ACL implementation",
-            "symfony/class-loader": "2.2.*",
-            "symfony/finder": "2.2.*",
-            "symfony/form": "2.2.*",
-            "symfony/routing": "2.2.*",
-            "symfony/validator": "2.2.*"
-        },
-        "time": "2013-04-02 09:39:57",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\Security\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Security Component",
-        "homepage": "http://symfony.com"
-    },
     {
         "name": "symfony/translation",
         "version": "dev-master",
@@ -2287,38 +2028,54 @@
         "homepage": "http://symfony.com"
     },
     {
-        "name": "symfony/console",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Component/Console",
+        "name": "symfony/twig-bridge",
+        "version": "2.2.x-dev",
+        "version_normalized": "2.2.9999999.9999999-dev",
+        "target-dir": "Symfony/Bridge/Twig",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Console.git",
-            "reference": "2d4f1e5bb1144f66edb34becf3b4b29193c628f7"
+            "url": "https://github.com/symfony/TwigBridge.git",
+            "reference": "3cd45a283efbfbf7320076c6d15e8c9ad36e77d3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Console/zipball/2d4f1e5bb1144f66edb34becf3b4b29193c628f7",
-            "reference": "2d4f1e5bb1144f66edb34becf3b4b29193c628f7",
+            "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/3cd45a283efbfbf7320076c6d15e8c9ad36e77d3",
+            "reference": "3cd45a283efbfbf7320076c6d15e8c9ad36e77d3",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
-        },
+            "php": ">=5.3.3",
+            "twig/twig": ">=1.11.0,<2.0"
+        },
         "require-dev": {
-            "symfony/event-dispatcher": ">=2.1,<3.0"
+            "symfony/form": "2.2.*",
+            "symfony/http-kernel": ">=2.2,<2.3-dev",
+            "symfony/routing": ">=2.2,<2.3-dev",
+            "symfony/security": ">=2.0,<2.3-dev",
+            "symfony/templating": ">=2.1,<3.0",
+            "symfony/translation": ">=2.0,<2.3-dev",
+            "symfony/yaml": ">=2.0,<3.0"
         },
-        "time": "2013-04-07 14:24:42",
-        "type": "library",
+        "suggest": {
+            "symfony/form": "2.2.*",
+            "symfony/http-kernel": "2.2.*",
+            "symfony/routing": "2.2.*",
+            "symfony/security": "2.2.*",
+            "symfony/templating": "2.2.*",
+            "symfony/translation": "2.2.*",
+            "symfony/yaml": "2.2.*"
+        },
+        "time": "2013-04-05 21:29:42",
+        "type": "symfony-bridge",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.3-dev"
+                "dev-master": "2.2-dev"
             }
         },
         "installation-source": "source",
         "autoload": {
             "psr-0": {
-                "Symfony\\Component\\Console\\": ""
+                "Symfony\\Bridge\\Twig\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -2335,58 +2092,166 @@
                 "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Console Component",
+        "description": "Symfony Twig Bridge",
         "homepage": "http://symfony.com"
     },
     {
-        "name": "symfony/twig-bridge",
-        "version": "2.2.x-dev",
-        "version_normalized": "2.2.9999999.9999999-dev",
-        "target-dir": "Symfony/Bridge/Twig",
+        "name": "twig/twig",
+        "version": "v1.12.3",
+        "version_normalized": "1.12.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/TwigBridge.git",
-            "reference": "3cd45a283efbfbf7320076c6d15e8c9ad36e77d3"
+            "url": "https://github.com/fabpot/Twig.git",
+            "reference": "v1.12.3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/3cd45a283efbfbf7320076c6d15e8c9ad36e77d3",
-            "reference": "3cd45a283efbfbf7320076c6d15e8c9ad36e77d3",
+            "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3",
+            "reference": "v1.12.3",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.4"
+        },
+        "time": "2013-04-08 12:40:11",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.12-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Twig_": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Armin Ronacher",
+                "email": "armin.ronacher@active-4.com"
+            }
+        ],
+        "description": "Twig, the flexible, fast, and secure template language for PHP",
+        "homepage": "http://twig.sensiolabs.org",
+        "keywords": [
+            "templating"
+        ]
+    },
+    {
+        "name": "igorw/config-service-provider",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/igorw/ConfigServiceProvider.git",
+            "reference": "1b834386a3e535a95928445129390242fb5a7b05"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/igorw/ConfigServiceProvider/zipball/1b834386a3e535a95928445129390242fb5a7b05",
+            "reference": "1b834386a3e535a95928445129390242fb5a7b05",
+            "shasum": ""
+        },
+        "require": {
+            "silex/silex": "1.0.*@dev"
+        },
+        "require-dev": {
+            "symfony/yaml": ">=2.1,<3.0"
+        },
+        "suggest": {
+            "symfony/yaml": "~2.1"
+        },
+        "time": "2013-04-08 13:55:50",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Igorw\\Silex": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Igor Wiedler",
+                "email": "igor@wiedler.ch",
+                "homepage": "http://wiedler.ch/igor/"
+            },
+            {
+                "name": "Contributors",
+                "homepage": "https://github.com/igorw/ConfigServiceProvider/contributors"
+            }
+        ],
+        "description": "A config ServiceProvider for Silex with support for php, json and yaml.",
+        "keywords": [
+            "silex"
+        ]
+    },
+    {
+        "name": "symfony/security",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Component/Security",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Security.git",
+            "reference": "d62296fc75038d884314ed78bbf4fa2e95654017"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Security/zipball/d62296fc75038d884314ed78bbf4fa2e95654017",
+            "reference": "d62296fc75038d884314ed78bbf4fa2e95654017",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3",
-            "twig/twig": ">=1.11.0,<2.0"
+            "symfony/event-dispatcher": ">=2.1,<3.0",
+            "symfony/http-foundation": ">=2.1,<2.4-dev",
+            "symfony/http-kernel": ">=2.1,<=2.3-dev"
         },
         "require-dev": {
-            "symfony/form": "2.2.*",
-            "symfony/http-kernel": ">=2.2,<2.3-dev",
-            "symfony/routing": ">=2.2,<2.3-dev",
-            "symfony/security": ">=2.0,<2.3-dev",
-            "symfony/templating": ">=2.1,<3.0",
-            "symfony/translation": ">=2.0,<2.3-dev",
-            "symfony/yaml": ">=2.0,<3.0"
+            "doctrine/common": ">=2.2,<3.0",
+            "doctrine/dbal": ">=2.2,<3.0",
+            "psr/log": ">=1.0,<2.0",
+            "symfony/form": ">=2.0,<3.0",
+            "symfony/routing": ">=2.2,<2.4-dev",
+            "symfony/validator": ">=2.2,<2.4-dev"
         },
         "suggest": {
+            "doctrine/dbal": "to use the built-in ACL implementation",
+            "symfony/class-loader": "2.2.*",
+            "symfony/finder": "2.2.*",
             "symfony/form": "2.2.*",
-            "symfony/http-kernel": "2.2.*",
             "symfony/routing": "2.2.*",
-            "symfony/security": "2.2.*",
-            "symfony/templating": "2.2.*",
-            "symfony/translation": "2.2.*",
-            "symfony/yaml": "2.2.*"
+            "symfony/validator": "2.2.*"
         },
-        "time": "2013-04-05 21:29:42",
-        "type": "symfony-bridge",
+        "time": "2013-04-07 20:25:23",
+        "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.2-dev"
+                "dev-master": "2.3-dev"
             }
         },
         "installation-source": "source",
         "autoload": {
             "psr-0": {
-                "Symfony\\Bridge\\Twig\\": ""
+                "Symfony\\Component\\Security\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -2403,9 +2268,145 @@
                 "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Twig Bridge",
+        "description": "Symfony Security Component",
         "homepage": "http://symfony.com"
     },
+    {
+        "name": "symfony/console",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Component/Console",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Console.git",
+            "reference": "d789216529d541b55cf39141724ca71733265f60"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Console/zipball/d789216529d541b55cf39141724ca71733265f60",
+            "reference": "d789216529d541b55cf39141724ca71733265f60",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "symfony/event-dispatcher": ">=2.1,<3.0"
+        },
+        "time": "2013-04-07 20:25:23",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Component\\Console\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Console Component",
+        "homepage": "http://symfony.com"
+    },
+    {
+        "name": "silex/silex",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fabpot/Silex.git",
+            "reference": "80f0abd669b2c615b73065b76c63ff27c7d3c38d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fabpot/Silex/zipball/80f0abd669b2c615b73065b76c63ff27c7d3c38d",
+            "reference": "80f0abd669b2c615b73065b76c63ff27c7d3c38d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "pimple/pimple": "1.*",
+            "symfony/event-dispatcher": ">=2.1,<2.3-dev",
+            "symfony/http-foundation": ">=2.1,<2.3-dev",
+            "symfony/http-kernel": ">=2.1,<2.3-dev",
+            "symfony/routing": ">=2.1,<2.3-dev"
+        },
+        "require-dev": {
+            "doctrine/dbal": ">=2.2.0,<2.4.0-dev",
+            "monolog/monolog": ">=1.4,<2.0,>=1.4.1",
+            "swiftmailer/swiftmailer": "4.2.*",
+            "symfony/browser-kit": ">=2.1,<2.3-dev",
+            "symfony/config": ">=2.1,<2.3-dev",
+            "symfony/css-selector": ">=2.1,<2.3-dev",
+            "symfony/dom-crawler": ">=2.1,<2.3-dev",
+            "symfony/finder": ">=2.1,<2.3-dev",
+            "symfony/form": ">=2.1.4,<2.3-dev",
+            "symfony/locale": ">=2.1,<2.3-dev",
+            "symfony/monolog-bridge": ">=2.1,<2.3-dev",
+            "symfony/options-resolver": ">=2.1,<2.3-dev",
+            "symfony/process": ">=2.1,<2.3-dev",
+            "symfony/security": ">=2.1,<2.3-dev",
+            "symfony/serializer": ">=2.1,<2.3-dev",
+            "symfony/translation": ">=2.1,<2.3-dev",
+            "symfony/twig-bridge": ">=2.1,<2.3-dev",
+            "symfony/validator": ">=2.1,<2.3-dev",
+            "twig/twig": ">=1.8.0,<2.0-dev"
+        },
+        "suggest": {
+            "symfony/browser-kit": ">=2.1,<2.3-dev",
+            "symfony/css-selector": ">=2.1,<2.3-dev",
+            "symfony/dom-crawler": ">=2.1,<2.3-dev",
+            "symfony/form": "To make use of the FormServiceProvider, >= 2.1.4 is required"
+        },
+        "time": "2013-04-08 20:37:52",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Silex": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Igor Wiedler",
+                "email": "igor@wiedler.ch",
+                "homepage": "http://wiedler.ch/igor/"
+            }
+        ],
+        "description": "The PHP micro-framework based on the Symfony2 Components",
+        "homepage": "http://silex.sensiolabs.org",
+        "keywords": [
+            "microframework"
+        ]
+    },
     {
         "name": "leafo/lessphp",
         "version": "dev-master",
@@ -2413,15 +2414,15 @@
         "source": {
             "type": "git",
             "url": "https://github.com/leafo/lessphp.git",
-            "reference": "280b8bcce2256b0793feaed8a74568edcbab42ae"
+            "reference": "51aad6ef903bdcb18280ae81fb85016a078232a0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/leafo/lessphp/zipball/280b8bcce2256b0793feaed8a74568edcbab42ae",
-            "reference": "280b8bcce2256b0793feaed8a74568edcbab42ae",
+            "url": "https://api.github.com/repos/leafo/lessphp/zipball/51aad6ef903bdcb18280ae81fb85016a078232a0",
+            "reference": "51aad6ef903bdcb18280ae81fb85016a078232a0",
             "shasum": ""
         },
-        "time": "2013-04-07 17:30:42",
+        "time": "2013-04-09 01:25:49",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2456,12 +2457,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/l3pp4rd/DoctrineExtensions.git",
-            "reference": "db0585625f6944a755534688e971b86d1d33ec45"
+            "reference": "af197d8d65de90827778379a18dd44d82c61d3fc"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/db0585625f6944a755534688e971b86d1d33ec45",
-            "reference": "db0585625f6944a755534688e971b86d1d33ec45",
+            "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/af197d8d65de90827778379a18dd44d82c61d3fc",
+            "reference": "af197d8d65de90827778379a18dd44d82c61d3fc",
             "shasum": ""
         },
         "require": {
@@ -2481,7 +2482,7 @@
             "doctrine/mongodb-odm": ">=1.0.0-BETA7",
             "doctrine/orm": ">=2.3.2"
         },
-        "time": "2013-04-07 10:44:07",
+        "time": "2013-04-08 16:55:03",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2537,12 +2538,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/mheap/Silex-Assetic.git",
-            "reference": "2836391e9aadf60478a6ceff8d8d7f919946d0a9"
+            "reference": "a3a2747ca48897ebd1e1def300c58117969ad6aa"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/mheap/Silex-Assetic/zipball/2836391e9aadf60478a6ceff8d8d7f919946d0a9",
-            "reference": "2836391e9aadf60478a6ceff8d8d7f919946d0a9",
+            "url": "https://api.github.com/repos/mheap/Silex-Assetic/zipball/a3a2747ca48897ebd1e1def300c58117969ad6aa",
+            "reference": "a3a2747ca48897ebd1e1def300c58117969ad6aa",
             "shasum": ""
         },
         "require": {
@@ -2558,7 +2559,7 @@
         "suggest": {
             "twig/twig": "~1.2"
         },
-        "time": "2013-04-06 13:09:31",
+        "time": "2013-04-09 10:37:15",
         "type": "library",
         "extra": {
             "branch-alias": {

+ 4 - 0
vendor/gedmo/doctrine-extensions/lib/Gedmo/Uploadable/UploadableListener.php

@@ -483,6 +483,7 @@ class UploadableListener extends MappedEventSubscriber
             'fileName'          => '',
             'fileExtension'     => '',
             'fileWithoutExt'    => '',
+            'origFileName'      => '',
             'filePath'          => '',
             'fileMimeType'      => $fileInfo->getType(),
             'fileSize'          => $fileInfo->getSize()
@@ -500,6 +501,9 @@ class UploadableListener extends MappedEventSubscriber
             $info['fileWithoutExt'] = $info['fileName'];
         }
 
+        // Save the original filename for later use
+        $info['origFileName'] = $info['fileName'];
+
         // Now we generate the filename using the configured class
         if ($filenameGeneratorClass) {
             $filename = $filenameGeneratorClass::generate(

+ 2 - 1
vendor/igorw/config-service-provider/README.md

@@ -74,7 +74,8 @@ If reading the config file on every request becomes a performance problem in
 production, you can use a plain PHP file instead, and it will get cached by
 APC.
 
-Just make sure it ends with `.php`:
+You'll have to rewrite your config to be a PHP file that returns the array of
+config data, and also make sure it ends with `.php`:
 
     $app->register(new Igorw\Silex\ConfigServiceProvider(__DIR__."/../config/prod.php"));
 

+ 1 - 1
vendor/leafo/lessphp

@@ -1 +1 @@
-Subproject commit 280b8bcce2256b0793feaed8a74568edcbab42ae
+Subproject commit 51aad6ef903bdcb18280ae81fb85016a078232a0

+ 1 - 1
vendor/mheap/silex-assetic

@@ -1 +1 @@
-Subproject commit 2836391e9aadf60478a6ceff8d8d7f919946d0a9
+Subproject commit a3a2747ca48897ebd1e1def300c58117969ad6aa

+ 2 - 1
vendor/silex/silex/composer.json

@@ -40,7 +40,8 @@
         "symfony/validator": ">=2.1,<2.3-dev",
         "twig/twig": ">=1.8.0,<2.0-dev",
         "doctrine/dbal": ">=2.2.0,<2.4.0-dev",
-        "swiftmailer/swiftmailer": "4.2.*"
+        "swiftmailer/swiftmailer": "4.2.*",
+        "monolog/monolog": "~1.4,>=1.4.1"
     },
     "suggest": {
         "symfony/browser-kit": ">=2.1,<2.3-dev",

+ 2 - 2
vendor/silex/silex/src/Silex/Provider/MonologServiceProvider.php

@@ -73,9 +73,9 @@ class MonologServiceProvider implements ServiceProviderInterface
         $app->error(function (\Exception $e) use ($app) {
             $message = sprintf('%s: %s (uncaught exception) at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine());
             if ($e instanceof HttpExceptionInterface && $e->getStatusCode() < 500) {
-                $app['monolog']->addError($message);
+                $app['monolog']->addError($message, array('exception' => $e));
             } else {
-                $app['monolog']->addCritical($message);
+                $app['monolog']->addCritical($message, array('exception' => $e));
             }
         }, 255);
 

+ 21 - 21
vendor/symfony/console/Symfony/Component/Console/Application.php

@@ -503,20 +503,24 @@ class Application
      */
     public function findNamespace($namespace)
     {
-        $allNamespaces = array();
-        foreach ($this->getNamespaces() as $n) {
-            $allNamespaces[$n] = explode(':', $n);
-        }
-
-        $found = array();
+        $allNamespaces = $this->getNamespaces();
+        $found = '';
         foreach (explode(':', $namespace) as $i => $part) {
-            $abbrevs = static::getAbbreviations(array_unique(array_values(array_filter(array_map(function ($p) use ($i) { return isset($p[$i]) ? $p[$i] : ''; }, $allNamespaces)))));
+            // select sub-namespaces matching the current namespace we found
+            $namespaces = array();
+            foreach ($allNamespaces as $n) {
+                if ('' === $found || 0 === strpos($n, $found)) {
+                    $namespaces[$n] = explode(':', $n);
+                }
+            }
+
+            $abbrevs = static::getAbbreviations(array_unique(array_values(array_filter(array_map(function ($p) use ($i) { return isset($p[$i]) ? $p[$i] : ''; }, $namespaces)))));
 
             if (!isset($abbrevs[$part])) {
                 $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
 
                 if (1 <= $i) {
-                    $part = implode(':', $found).':'.$part;
+                    $part = $found.':'.$part;
                 }
 
                 if ($alternatives = $this->findAlternativeNamespace($part, $abbrevs)) {
@@ -532,14 +536,19 @@ class Application
                 throw new \InvalidArgumentException($message);
             }
 
+            // there are multiple matches, but $part is an exact match of one of them so we select it
+            if (in_array($part, $abbrevs[$part])) {
+                $abbrevs[$part] = array($part);
+            }
+
             if (count($abbrevs[$part]) > 1) {
                 throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions($abbrevs[$part])));
             }
 
-            $found[] = $abbrevs[$part][0];
+            $found .= $found ? ':' . $abbrevs[$part][0] : $abbrevs[$part][0];
         }
 
-        return implode(':', $found);
+        return $found;
     }
 
     /**
@@ -662,21 +671,12 @@ class Application
     {
         $abbrevs = array();
         foreach ($names as $name) {
-            for ($len = strlen($name) - 1; $len > 0; --$len) {
+            for ($len = strlen($name); $len > 0; --$len) {
                 $abbrev = substr($name, 0, $len);
-                if (!isset($abbrevs[$abbrev])) {
-                    $abbrevs[$abbrev] = array($name);
-                } else {
-                    $abbrevs[$abbrev][] = $name;
-                }
+                $abbrevs[$abbrev][] = $name;
             }
         }
 
-        // Non-abbreviations always get entered, even if they aren't unique
-        foreach ($names as $name) {
-            $abbrevs[$name] = array($name);
-        }
-
         return $abbrevs;
     }
 

+ 10 - 0
vendor/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -351,6 +351,16 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
+    {
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getNamespaces'));
+        $application->expects($this->once())
+            ->method('getNamespaces')
+            ->will($this->returnValue(array('foo:sublong', 'bar:sub')));
+
+        $this->assertEquals('foo:sublong', $application->findNamespace('f:sub'));
+    }
+
     public function testSetCatchExceptions()
     {
         $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));

+ 5 - 1
vendor/symfony/security/Symfony/Component/Security/Acl/Dbal/AclProvider.php

@@ -263,7 +263,11 @@ SELECTCLAUSE;
         for ($i = 0; $i < $count; $i++) {
             if (!isset($types[$batch[$i]->getType()])) {
                 $types[$batch[$i]->getType()] = true;
-                if ($count > 1) {
+
+                // if there is more than one type we can safely break out of the
+                // loop, because it is the differentiator factor on whether to
+                // query for only one or more class types
+                if (count($types) > 1) {
                     break;
                 }
             }

+ 17 - 0
vendor/symfony/security/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php

@@ -72,6 +72,23 @@ class AclProviderTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($oids[1]->equals($acl1->getObjectIdentity()));
     }
 
+    public function testFindAclsWithDifferentTypes()
+    {
+        $oids = array();
+        $oids[] = new ObjectIdentity('123', 'Bundle\SomeVendor\MyBundle\Entity\SomeEntity');
+        $oids[] = new ObjectIdentity('123', 'Bundle\MyBundle\Entity\AnotherEntity');
+
+        $provider = $this->getProvider();
+
+        $acls = $provider->findAcls($oids);
+        $this->assertInstanceOf('SplObjectStorage', $acls);
+        $this->assertCount(2, $acls);
+        $this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\Acl', $acl0 = $acls->offsetGet($oids[0]));
+        $this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\Acl', $acl1 = $acls->offsetGet($oids[1]));
+        $this->assertTrue($oids[0]->equals($acl0->getObjectIdentity()));
+        $this->assertTrue($oids[1]->equals($acl1->getObjectIdentity()));
+    }
+
     public function testFindAclCachesAclInMemory()
     {
         $oid = new ObjectIdentity('1', 'foo');

+ 9 - 1
vendor/twig/twig/CHANGELOG

@@ -1,3 +1,11 @@
+* 1.12.3 (2013-04-08)
+
+ * fixed a security issue in the filesystem loader where it was possible to include a template one
+   level above the configured path
+ * fixed fatal error that should be an exception when adding a filter/function/test too late
+ * added a batch filter
+ * added support for encoding an array as query string in the url_encode filter
+
 * 1.12.2 (2013-02-09)
 
  * fixed the timezone used by the date filter and function when the given date contains a timezone (like 2010-01-28T15:00:00+02:00)
@@ -381,7 +389,7 @@ Changes:
  * enhanced error messages when an unexpected token is parsed in an expression
  * fixed filename not being added to syntax error messages
  * added the autoescape option to enable/disable autoescaping
- * removed the newline after a comment (mimicks PHP behavior)
+ * removed the newline after a comment (mimics PHP behavior)
  * added a syntax error exception when parent block is used on a template that does not extend another one
  * made the Escaper extension enabled by default
  * fixed sandbox extension when used with auto output escaping

+ 45 - 0
vendor/twig/twig/doc/filters/batch.rst

@@ -0,0 +1,45 @@
+``batch``
+=========
+
+.. versionadded:: 1.12.3
+    The batch filter was added in Twig 1.12.3.
+
+The ``batch`` filter "batches" items by returning a list of lists with the
+given number of items. If you provide a second parameter, it is used to fill
+missing items:
+
+.. code-block:: jinja
+
+    {% set items = ['a', 'b', 'c', 'd', 'e', 'f', 'g'] %}
+
+    <table>
+    {% for row in items|batch(3, 'No item') %}
+      <tr>
+      {% for column in row %}
+        <td>{{ column }}</td>
+      {% endfor %}
+      </tr>
+    {% endfor %}
+    </table>
+
+The above example will be rendered as:
+
+.. code-block:: jinja
+
+    <table>
+      <tr>
+          <td>a</td>
+          <td>b</td>
+          <td>c</td>
+        </tr>
+      <tr>
+          <td>d</td>
+          <td>e</td>
+          <td>f</td>
+        </tr>
+      <tr>
+          <td>g</td>
+          <td>No item</td>
+          <td>No item</td>
+        </tr>
+    </table>

+ 21 - 20
vendor/twig/twig/doc/filters/index.rst

@@ -4,32 +4,33 @@ Filters
 .. toctree::
     :maxdepth: 1
 
+    abs
+    batch
+    capitalize
+    convert_encoding
     date
     date_modify
+    default
+    escape
+    first
     format
-    replace
-    number_format
-    url_encode
+    join
     json_encode
-    convert_encoding
-    title
-    capitalize
+    keys
+    last
+    length
+    lower
     nl2br
+    number_format
+    merge
     upper
-    lower
-    striptags
-    join
-    split
-    reverse
-    abs
-    length
-    sort
-    default
-    keys
-    escape
     raw
-    merge
+    replace
+    reverse
     slice
-    first
-    last
+    sort
+    split
+    striptags
+    title
     trim
+    url_encode

+ 3 - 1
vendor/twig/twig/doc/filters/json_encode.rst

@@ -14,6 +14,8 @@ The ``json_encode`` filter returns the JSON representation of a string:
 Arguments
 ---------
 
- * ``options``: The options
+ * ``options``: A bitmask of `json_encode options`_ (``{{
+   data|json_encode(constant(JSON_PRETTY_PRINT)) }}``)
 
 .. _`json_encode`: http://php.net/json_encode
+.. _`json_encode options`: http://www.php.net/manual/en/json.constants.php

+ 1 - 1
vendor/twig/twig/doc/filters/merge.rst

@@ -1,7 +1,7 @@
 ``merge``
 =========
 
-The ``merge`` filter merges an array with the another array:
+The ``merge`` filter merges an array with another array:
 
 .. code-block:: jinja
 

+ 1 - 1
vendor/twig/twig/doc/filters/sort.rst

@@ -5,7 +5,7 @@ The ``sort`` filter sorts an array:
 
 .. code-block:: jinja
 
-    {% for use in users|sort %}
+    {% for user in users|sort %}
         ...
     {% endfor %}
 

+ 1 - 1
vendor/twig/twig/doc/filters/striptags.rst

@@ -6,7 +6,7 @@ by one space:
 
 .. code-block:: jinja
 
-    {% some_html|striptags %}
+    {{ some_html|striptags }}
 
 .. note::
 

+ 12 - 3
vendor/twig/twig/doc/filters/url_encode.rst

@@ -1,14 +1,23 @@
 ``url_encode``
 ==============
 
-The ``url_encode`` filter URL encodes a given string:
+.. versionadded:: 1.12.3
+    Support for encoding an array as query string was added in Twig 1.12.3.
+
+The ``url_encode`` filter percent encodes a given string as URL segment
+or an array as query string:
 
 .. code-block:: jinja
 
-    {{ data|url_encode() }}
+    {{ "path-seg*ment"|url_encode }}
+    {# outputs "path-seg%2Ament" #}
+
+    {{ {'param': 'value', 'foo': 'bar'}|url_encode }}
+    {# outputs "param=value&foo=bar" #}
 
 .. note::
 
-    Internally, Twig uses the PHP `urlencode`_ function.
+    Internally, Twig uses the PHP `urlencode`_ or the `http_build_query`_ function.
 
 .. _`urlencode`: http://php.net/urlencode
+.. _`http_build_query`: http://php.net/http_build_query

+ 7 - 7
vendor/twig/twig/doc/functions/index.rst

@@ -4,14 +4,14 @@ Functions
 .. toctree::
     :maxdepth: 1
 
-    range
-    cycle
-    constant
-    random
     attribute
     block
-    parent
-    dump
+    constant
+    cycle
     date
-    template_from_string
+    dump
     include
+    parent
+    random
+    range
+    template_from_string

+ 15 - 0
vendor/twig/twig/doc/tags/for.rst

@@ -155,3 +155,18 @@ You can also access both keys and values:
             <li>{{ key }}: {{ user.username|e }}</li>
         {% endfor %}
     </ul>
+
+Iterating over a Subset
+-----------------------
+
+You might want to iterate over a subset of values. This can be achieved using
+the :doc:`slice <../filters/slice>` filter:
+
+.. code-block:: jinja
+
+    <h1>Top Ten Members</h1>
+    <ul>
+        {% for user in users|slice(0, 10) %}
+            <li>{{ user.username|e }}</li>
+        {% endfor %}
+    </ul>

+ 12 - 12
vendor/twig/twig/doc/tags/index.rst

@@ -4,21 +4,21 @@ Tags
 .. toctree::
     :maxdepth: 1
 
+    autoescape
+    block
+    filter
+    do
+    embed
+    extends
+    flush
     for
+    from
     if
+    import
+    include
     macro
-    filter
+    sandbox
     set
-    extends
-    block
-    include
-    import
-    from
-    use
     spaceless
-    autoescape
+    use
     verbatim
-    flush
-    do
-    sandbox
-    embed

+ 5 - 5
vendor/twig/twig/doc/tests/index.rst

@@ -4,12 +4,12 @@ Tests
 .. toctree::
     :maxdepth: 1
 
-    divisibleby
-    null
-    even
-    odd
-    sameas
     constant
     defined
+    divisibleby
     empty
+    even
     iterable
+    null
+    odd
+    sameas

+ 1 - 1
vendor/twig/twig/ext/twig/php_twig.h

@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.12.2"
+#define PHP_TWIG_VERSION "1.12.3"
 
 #include "php.h"
 

+ 3 - 0
vendor/twig/twig/ext/twig/twig.c

@@ -511,6 +511,7 @@ static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_arg
 {
 	smart_str *buf;
 	char *joiner;
+	APPLY_TSRMLS_FETCH();
 
 	buf = va_arg(args, smart_str*);
 	joiner = va_arg(args, char*);
@@ -643,6 +644,7 @@ static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, v
 	char *item;
 	size_t item_len;
 	zend_function *mptr = (zend_function *) pDest;
+	APPLY_TSRMLS_FETCH();
 
 	if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
 		return 0;
@@ -665,6 +667,7 @@ static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args,
 	zval *retval;
 	char *class_name, *prop_name;
 	zend_property_info *pptr = (zend_property_info *) pDest;
+	APPLY_TSRMLS_FETCH();
 
 	if (!(pptr->flags & ZEND_ACC_PUBLIC)) {
 		return 0;

+ 1 - 2
vendor/twig/twig/lib/Twig/Autoloader.php

@@ -12,8 +12,7 @@
 /**
  * Autoloads Twig classes.
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Autoloader
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Compiler.php

@@ -13,8 +13,7 @@
 /**
  * Compiles a node to PHP code.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Compiler implements Twig_CompilerInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/CompilerInterface.php

@@ -12,8 +12,7 @@
 /**
  * Interface implemented by compiler classes.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_CompilerInterface

+ 16 - 17
vendor/twig/twig/lib/Twig/Environment.php

@@ -12,12 +12,11 @@
 /**
  * Stores the Twig configuration.
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Environment
 {
-    const VERSION = '1.12.2';
+    const VERSION = '1.12.3';
 
     protected $charset;
     protected $loader;
@@ -757,10 +756,6 @@ class Twig_Environment
      */
     public function addFilter($name, $filter = null)
     {
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
-        }
-
         if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
             throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter');
         }
@@ -769,7 +764,11 @@ class Twig_Environment
             $filter = $name;
             $name = $filter->getName();
         }
-
+        
+        if ($this->extensionInitialized) {
+            throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
+        }
+        
         $this->staging->addFilter($name, $filter);
     }
 
@@ -846,10 +845,6 @@ class Twig_Environment
      */
     public function addTest($name, $test = null)
     {
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
-        }
-
         if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
             throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest');
         }
@@ -858,6 +853,10 @@ class Twig_Environment
             $test = $name;
             $name = $test->getName();
         }
+        
+        if ($this->extensionInitialized) {
+            throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
+        }
 
         $this->staging->addTest($name, $test);
     }
@@ -904,10 +903,6 @@ class Twig_Environment
      */
     public function addFunction($name, $function = null)
     {
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
-        }
-
         if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
             throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction');
         }
@@ -916,7 +911,11 @@ class Twig_Environment
             $function = $name;
             $name = $function->getName();
         }
-
+        
+        if ($this->extensionInitialized) {
+            throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
+        }
+        
         $this->staging->addFunction($name, $function);
     }
 

+ 1 - 2
vendor/twig/twig/lib/Twig/Error.php

@@ -29,8 +29,7 @@
  * can be disabled by passing false for both the filename and the line number
  * when creating a new instance of this class.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Error extends Exception
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Error/Loader.php

@@ -20,8 +20,7 @@
  *
  * This strategy makes Twig_Environment::resolveTemplate() much faster.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Error_Loader extends Twig_Error
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Error/Runtime.php

@@ -13,8 +13,7 @@
 /**
  * Exception thrown when an error occurs at runtime.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Error_Runtime extends Twig_Error
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Error/Syntax.php

@@ -13,8 +13,7 @@
 /**
  * Exception thrown when a syntax error occurs during lexing or parsing of a template.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Error_Syntax extends Twig_Error
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php

@@ -12,8 +12,7 @@
 /**
  * Adds an exists() method for loaders.
  *
- * @package    twig
- * @author     Florin Patan <florinpatan@gmail.com>
+ * @author Florin Patan <florinpatan@gmail.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_ExistsLoaderInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/ExpressionParser.php

@@ -18,8 +18,7 @@
  * @see http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm
  * @see http://en.wikipedia.org/wiki/Operator-precedence_parser
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_ExpressionParser
 {

+ 40 - 5
vendor/twig/twig/lib/Twig/Extension/Core.php

@@ -152,6 +152,7 @@ class Twig_Extension_Core extends Twig_Extension
             new Twig_SimpleFilter('split', 'twig_split_filter'),
             new Twig_SimpleFilter('sort', 'twig_sort_filter'),
             new Twig_SimpleFilter('merge', 'twig_array_merge'),
+            new Twig_SimpleFilter('batch', 'twig_array_batch'),
 
             // string/array filters
             new Twig_SimpleFilter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
@@ -170,8 +171,8 @@ class Twig_Extension_Core extends Twig_Extension
         );
 
         if (function_exists('mb_get_info')) {
-            $filters['upper'] = new Twig_Filter_Function('twig_upper_filter', array('needs_environment' => true));
-            $filters['lower'] = new Twig_Filter_Function('twig_lower_filter', array('needs_environment' => true));
+            $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', array('needs_environment' => true));
+            $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', array('needs_environment' => true));
         }
 
         return $filters;
@@ -514,15 +515,19 @@ function twig_number_format_filter(Twig_Environment $env, $number, $decimal = nu
 }
 
 /**
- * URL encodes a string.
+ * URL encodes a string as a path segment or an array as a query string.
  *
- * @param string $url A URL
- * @param bool   $raw true to use rawurlencode() instead of urlencode
+ * @param string|array $url A URL or an array of query parameters
+ * @param bool         $raw true to use rawurlencode() instead of urlencode
  *
  * @return string The URL encoded value
  */
 function twig_urlencode_filter($url, $raw = false)
 {
+    if (is_array($url)) {
+        return http_build_query($url, '', '&');
+    }
+
     if ($raw) {
         return rawurlencode($url);
     }
@@ -1307,3 +1312,33 @@ function twig_constant($constant, $object = null)
 
     return constant($constant);
 }
+
+/**
+ * Batches item.
+ *
+ * @param array   $items An array of items
+ * @param integer $size  The size of the batch
+ * @param string  $fill  A string to fill missing items
+ *
+ * @return array
+ */
+function twig_array_batch($items, $size, $fill = null)
+{
+    if ($items instanceof Traversable) {
+        $items = iterator_to_array($items, false);
+    }
+
+    $size = ceil($size);
+
+    $result = array_chunk($items, $size, true);
+
+    if (null !== $fill) {
+        $last = count($result) - 1;
+        $result[$last] = array_merge(
+            $result[$last],
+            array_fill(0, $size - count($result[$last]), $fill)
+        );
+    }
+
+    return $result;
+}

+ 1 - 2
vendor/twig/twig/lib/Twig/Extension/Staging.php

@@ -14,8 +14,7 @@
  *
  * This class is used by Twig_Environment as a staging area and must not be used directly.
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Extension_Staging extends Twig_Extension
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/ExtensionInterface.php

@@ -12,8 +12,7 @@
 /**
  * Interface implemented by extension classes.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 interface Twig_ExtensionInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Filter.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFilter instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/Filter/Function.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFilter instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 class Twig_Filter_Function extends Twig_Filter

+ 1 - 2
vendor/twig/twig/lib/Twig/Filter/Method.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFilter instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 class Twig_Filter_Method extends Twig_Filter

+ 1 - 2
vendor/twig/twig/lib/Twig/Filter/Node.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFilter instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 class Twig_Filter_Node extends Twig_Filter

+ 1 - 2
vendor/twig/twig/lib/Twig/FilterCallableInterface.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFilter instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_FilterCallableInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/FilterInterface.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFilter instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_FilterInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/Function.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFunction instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/Function/Function.php

@@ -15,8 +15,7 @@
  *
  * Use Twig_SimpleFunction instead.
  *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 class Twig_Function_Function extends Twig_Function

+ 1 - 2
vendor/twig/twig/lib/Twig/Function/Method.php

@@ -15,8 +15,7 @@
  *
  * Use Twig_SimpleFunction instead.
  *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 class Twig_Function_Method extends Twig_Function

+ 1 - 2
vendor/twig/twig/lib/Twig/Function/Node.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFunction instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 class Twig_Function_Node extends Twig_Function

+ 1 - 2
vendor/twig/twig/lib/Twig/FunctionCallableInterface.php

@@ -14,8 +14,7 @@
  *
  * Use Twig_SimpleFunction instead.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_FunctionCallableInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/FunctionInterface.php

@@ -15,8 +15,7 @@
  *
  * Use Twig_SimpleFunction instead.
  *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_FunctionInterface

+ 5 - 3
vendor/twig/twig/lib/Twig/Lexer.php

@@ -13,8 +13,7 @@
 /**
  * Lexes a template string.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Lexer implements Twig_LexerInterface
 {
@@ -32,6 +31,7 @@ class Twig_Lexer implements Twig_LexerInterface
     protected $regexes;
     protected $position;
     protected $positions;
+    protected $currentVarBlockLine;
 
     const STATE_DATA            = 0;
     const STATE_BLOCK           = 1;
@@ -186,12 +186,14 @@ class Twig_Lexer implements Twig_LexerInterface
                 } else {
                     $this->pushToken(Twig_Token::BLOCK_START_TYPE);
                     $this->pushState(self::STATE_BLOCK);
+                    $this->currentVarBlockLine = $this->lineno;
                 }
                 break;
 
             case $this->options['tag_variable'][0]:
                 $this->pushToken(Twig_Token::VAR_START_TYPE);
                 $this->pushState(self::STATE_VAR);
+                $this->currentVarBlockLine = $this->lineno;
                 break;
         }
     }
@@ -225,7 +227,7 @@ class Twig_Lexer implements Twig_LexerInterface
             $this->moveCursor($match[0]);
 
             if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->lineno, $this->filename);
+                throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->filename);
             }
         }
 

+ 1 - 2
vendor/twig/twig/lib/Twig/LexerInterface.php

@@ -12,8 +12,7 @@
 /**
  * Interface implemented by lexer classes.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_LexerInterface

+ 1 - 2
vendor/twig/twig/lib/Twig/Loader/Array.php

@@ -17,8 +17,7 @@
  * source code of the template). If you don't want to see your cache grows out of
  * control, you need to take care of clearing the old cache file by yourself.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Loader/Chain.php

@@ -12,8 +12,7 @@
 /**
  * Loads templates from other loaders.
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {

+ 2 - 2
vendor/twig/twig/lib/Twig/Loader/Filesystem.php

@@ -12,8 +12,7 @@
 /**
  * Loads template from the filesystem.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {
@@ -204,6 +203,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
             throw new Twig_Error_Loader('A template name cannot contain NUL bytes.');
         }
 
+        $name = ltrim($name, '/');
         $parts = explode('/', $name);
         $level = 0;
         foreach ($parts as $part) {

+ 1 - 2
vendor/twig/twig/lib/Twig/Loader/String.php

@@ -21,8 +21,7 @@
  * source code of the template). If you don't want to see your cache grows out of
  * control, you need to take care of clearing the old cache file by yourself.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/LoaderInterface.php

@@ -12,8 +12,7 @@
 /**
  * Interface all loaders must implement.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 interface Twig_LoaderInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Markup.php

@@ -12,8 +12,7 @@
 /**
  * Marks a content as safe.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Markup implements Countable
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node.php

@@ -13,8 +13,7 @@
 /**
  * Represents a node in the AST.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node implements Twig_NodeInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/AutoEscape.php

@@ -18,8 +18,7 @@
  *
  * If autoescaping is disabled, then the value is false.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_AutoEscape extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Block.php

@@ -13,8 +13,7 @@
 /**
  * Represents a block node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Block extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/BlockReference.php

@@ -13,8 +13,7 @@
 /**
  * Represents a block call node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Body.php

@@ -12,8 +12,7 @@
 /**
  * Represents a body node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Body extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Do.php

@@ -12,8 +12,7 @@
 /**
  * Represents a do node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Do extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Embed.php

@@ -12,8 +12,7 @@
 /**
  * Represents an embed node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Embed extends Twig_Node_Include
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression.php

@@ -13,8 +13,7 @@
 /**
  * Abstract class for all nodes that represents an expression.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 abstract class Twig_Node_Expression extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php

@@ -13,8 +13,7 @@
 /**
  * Represents a block call node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php

@@ -12,8 +12,7 @@
 /**
  * Represents an extension call node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php

@@ -16,8 +16,7 @@
  *  {{ var.foo|default('foo item on var is not defined') }}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Parent.php

@@ -13,8 +13,7 @@
 /**
  * Represents a parent node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Parent extends Twig_Node_Expression
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php

@@ -18,8 +18,7 @@
  *  {% endif %}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php

@@ -19,8 +19,7 @@
  * {% endif %}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php

@@ -16,8 +16,7 @@
  *  {% if loop.index is divisibleby(3) %}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Divisibleby extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php

@@ -16,8 +16,7 @@
  *  {{ var is even }}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Even extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php

@@ -16,8 +16,7 @@
  *  {{ var is none }}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Null extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php

@@ -16,8 +16,7 @@
  *  {{ var is odd }}
  * </pre>
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Odd extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php

@@ -12,8 +12,7 @@
 /**
  * Checks if a variable is the same as another one (=== in PHP).
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Expression_Test_Sameas extends Twig_Node_Expression_Test
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Flush.php

@@ -12,8 +12,7 @@
 /**
  * Represents a flush node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Flush extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/For.php

@@ -13,8 +13,7 @@
 /**
  * Represents a for node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_For extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/ForLoop.php

@@ -12,8 +12,7 @@
 /**
  * Internal node used by the for node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_ForLoop extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/If.php

@@ -13,8 +13,7 @@
 /**
  * Represents an if node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_If extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Import.php

@@ -12,8 +12,7 @@
 /**
  * Represents an import node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Import extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Include.php

@@ -13,8 +13,7 @@
 /**
  * Represents an include node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Macro.php

@@ -12,8 +12,7 @@
 /**
  * Represents a macro node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Macro extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Module.php

@@ -13,8 +13,7 @@
 /**
  * Represents a module node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Module extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Print.php

@@ -13,8 +13,7 @@
 /**
  * Represents a node that outputs an expression.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Sandbox.php

@@ -12,8 +12,7 @@
 /**
  * Represents a sandbox node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Sandbox extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/SandboxedModule.php

@@ -13,8 +13,7 @@
 /**
  * Represents a module node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_SandboxedModule extends Twig_Node_Module
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php

@@ -17,8 +17,7 @@
  * and if the sandbox is enabled, we need to check that the __toString()
  * method is allowed if 'article' is an object.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_SandboxedPrint extends Twig_Node_Print
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Set.php

@@ -12,8 +12,7 @@
 /**
  * Represents a set node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Set extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Spaceless.php

@@ -14,8 +14,7 @@
  *
  * It removes spaces between HTML tags.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Spaceless extends Twig_Node
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/Node/Text.php

@@ -13,8 +13,7 @@
 /**
  * Represents a text node.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/NodeInterface.php

@@ -12,8 +12,7 @@
 /**
  * Represents a node in the AST.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_NodeInterface extends Countable, IteratorAggregate

+ 1 - 2
vendor/twig/twig/lib/Twig/NodeOutputInterface.php

@@ -12,8 +12,7 @@
 /**
  * Represents a displayable node in the AST.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 interface Twig_NodeOutputInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/NodeTraverser.php

@@ -14,8 +14,7 @@
  *
  * It visits all nodes and their children and call the given visitor for each.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeTraverser
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php

@@ -12,8 +12,7 @@
 /**
  * Twig_NodeVisitor_Escaper implements output escaping.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php

@@ -17,8 +17,7 @@
  * You can configure which optimizations you want to activate via the
  * optimizer mode.
  *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
 {

+ 1 - 2
vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php

@@ -12,8 +12,7 @@
 /**
  * Twig_NodeVisitor_Sandbox implements sandboxing.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeVisitor_Sandbox implements Twig_NodeVisitorInterface
 {

Деякі файли не було показано, через те що забагато файлів було змінено