commit 73597171203ec311e23355f12d07be3306fdc52e
parent 0b348f89dba5edd40fedb45b93bb59254591f242
Author: Felicitus <felicitus@felicitus.org>
Date: Fri, 30 Jan 2015 18:36:38 +0100
Merge branch 'sf2migration' of github.com:partkeepr/PartKeepr
Diffstat:
5 files changed, 550 insertions(+), 416 deletions(-)
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -648,8 +648,6 @@ class SymfonyRequirements extends RequirementCollection
||
(extension_loaded('apc') && ini_get('apc.enabled'))
||
- (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable'))
- ||
(extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
||
(extension_loaded('xcache') && ini_get('xcache.cacher'))
@@ -663,16 +661,6 @@ class SymfonyRequirements extends RequirementCollection
'Install and enable a <strong>PHP accelerator</strong> like APC (highly recommended).'
);
- if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
- $this->addPhpIniRecommendation(
- 'realpath_cache_size',
- create_function('$cfgValue', 'return (int) $cfgValue > 1000;'),
- false,
- 'realpath_cache_size should be above 1024 in php.ini',
- 'Set "<strong>realpath_cache_size</strong>" to e.g. "<strong>1024</strong>" in php.ini<a href="#phpini">*</a> to improve performance on windows.'
- );
- }
-
$this->addPhpIniRecommendation('short_open_tag', false);
$this->addPhpIniRecommendation('magic_quotes_gpc', false, true);
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -0,0 +1,20 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+ database_driver: pdo_mysql
+ database_host: 127.0.0.1
+ database_port: ~
+ database_name: symfony
+ database_user: root
+ database_password: ~
+ # You should uncomment this if you want use pdo_sqlite
+ # database_path: "%kernel.root_dir%/data.db3"
+
+ mailer_transport: smtp
+ mailer_host: 127.0.0.1
+ mailer_user: ~
+ mailer_password: ~
+
+ locale: en
+
+ # A secret key that's used to generate certain security-related tokens
+ secret: ThisTokenIsNotSoSecretChangeIt+
\ No newline at end of file
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
"require": {
"php": ">=5.3.3",
"symfony/symfony": "~2.4",
+ "incenteev/composer-parameter-handler": "~2.0",
"doctrine/orm": "~2.2,>=2.2.3",
"doctrine/doctrine-bundle": "~1.2",
"twig/extensions": "~1.0",
@@ -49,16 +50,24 @@
"minimum-stability": "dev",
"scripts": {
"post-install-cmd": [
+ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
],
"post-update-cmd": [
+ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+
]
+ },
+ "extra": {
+ "incenteev-parameters": {
+ "file": "app/config/parameters.yml"
+ }
}
}
diff --git a/composer.lock b/composer.lock
@@ -1,9 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "This file is @generated automatically"
],
- "hash": "600470898c9dfc307c03d3c533fe969a",
+ "hash": "8bc55e2892a2962b7ce459f27bc05e13",
"packages": [
{
"name": "cbsi/doctrine2-nestedset",
@@ -61,12 +62,12 @@
"source": {
"type": "git",
"url": "https://github.com/dflydev/dflydev-markdown.git",
- "reference": "6baed9b50f29c980795b6656d43722aadb126f7e"
+ "reference": "dee1f7a6b60776a94c10efa8340ccd486ec834b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dflydev/dflydev-markdown/zipball/6baed9b50f29c980795b6656d43722aadb126f7e",
- "reference": "6baed9b50f29c980795b6656d43722aadb126f7e",
+ "url": "https://api.github.com/repos/dflydev/dflydev-markdown/zipball/dee1f7a6b60776a94c10efa8340ccd486ec834b7",
+ "reference": "dee1f7a6b60776a94c10efa8340ccd486ec834b7",
"shasum": ""
},
"require": {
@@ -107,12 +108,12 @@
"homepage": "http://daringfireball.net"
}
],
- "description": "PHP Markdown & Extra",
+ "description": "PHP Markdown & Extra - DEPRECATED",
"homepage": "http://github.com/dflydev/dflydev-markdown",
"keywords": [
"markdown"
],
- "time": "2013-09-23 12:00:18"
+ "time": "2014-01-06 23:32:02"
},
{
"name": "doctrine/annotations",
@@ -120,12 +121,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "97b4a00c5a40c42d8c0b789dabc04b3332c788ab"
+ "reference": "3b6668f54ad3f95d68b64a742f6b0de55d6caeb1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/97b4a00c5a40c42d8c0b789dabc04b3332c788ab",
- "reference": "97b4a00c5a40c42d8c0b789dabc04b3332c788ab",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/3b6668f54ad3f95d68b64a742f6b0de55d6caeb1",
+ "reference": "3b6668f54ad3f95d68b64a742f6b0de55d6caeb1",
"shasum": ""
},
"require": {
@@ -133,12 +134,13 @@
"php": ">=5.3.2"
},
"require-dev": {
- "doctrine/cache": "1.*"
+ "doctrine/cache": "1.*",
+ "phpunit/phpunit": "4.*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -152,17 +154,6 @@
],
"authors": [
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
@@ -171,10 +162,16 @@
"email": "kontakt@beberlei.de"
},
{
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Docblock Annotations Parser",
@@ -184,7 +181,7 @@
"docblock",
"parser"
],
- "time": "2013-12-13 21:02:36"
+ "time": "2014-11-04 15:34:10"
},
{
"name": "doctrine/cache",
@@ -192,12 +189,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "ff36d4216fef8242c3d8ee97fceee977e3c9b9a6"
+ "reference": "912e8a11ce3c75a630b225dd82aed83e00943ed5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/ff36d4216fef8242c3d8ee97fceee977e3c9b9a6",
- "reference": "ff36d4216fef8242c3d8ee97fceee977e3c9b9a6",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/912e8a11ce3c75a630b225dd82aed83e00943ed5",
+ "reference": "912e8a11ce3c75a630b225dd82aed83e00943ed5",
"shasum": ""
},
"require": {
@@ -227,17 +224,6 @@
],
"authors": [
{
- "name": "Jonathan H. Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
@@ -246,10 +232,16 @@
"email": "kontakt@beberlei.de"
},
{
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
@@ -258,7 +250,7 @@
"cache",
"caching"
],
- "time": "2013-11-23 16:10:06"
+ "time": "2014-10-20 19:28:25"
},
{
"name": "doctrine/collections",
@@ -266,17 +258,20 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
- "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc"
+ "reference": "38ed66e6606309bec203a9df506ffa26d956d21d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/bcb53776a096a0c64579cc8d8ec0db62f1109fbc",
- "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/38ed66e6606309bec203a9df506ffa26d956d21d",
+ "reference": "38ed66e6606309bec203a9df506ffa26d956d21d",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
"type": "library",
"extra": {
"branch-alias": {
@@ -294,17 +289,6 @@
],
"authors": [
{
- "name": "Jonathan H. Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
@@ -313,10 +297,16 @@
"email": "kontakt@beberlei.de"
},
{
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Collections Abstraction library",
@@ -326,20 +316,20 @@
"collections",
"iterator"
],
- "time": "2013-08-29 16:56:45"
+ "time": "2014-11-05 15:56:21"
},
{
"name": "doctrine/common",
- "version": "2.4.x-dev",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "c94d6ff79e25418b1225e187c782bf4742f23a8b"
+ "reference": "559a805125524b0bb6742638784c2979a5c5e607"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/c94d6ff79e25418b1225e187c782bf4742f23a8b",
- "reference": "c94d6ff79e25418b1225e187c782bf4742f23a8b",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/559a805125524b0bb6742638784c2979a5c5e607",
+ "reference": "559a805125524b0bb6742638784c2979a5c5e607",
"shasum": ""
},
"require": {
@@ -350,10 +340,13 @@
"doctrine/lexer": "1.*",
"php": ">=5.3.2"
},
+ "require-dev": {
+ "phpunit/phpunit": "~3.7"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4.x-dev"
+ "dev-master": "2.5.x-dev"
}
},
"autoload": {
@@ -367,17 +360,6 @@
],
"authors": [
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
@@ -386,10 +368,16 @@
"email": "kontakt@beberlei.de"
},
{
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Common Library for Doctrine projects",
@@ -401,7 +389,7 @@
"persistence",
"spl"
],
- "time": "2013-09-07 10:20:35"
+ "time": "2014-07-27 17:39:50"
},
{
"name": "doctrine/dbal",
@@ -409,25 +397,28 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "390db30f686f3a7ab555178ac22d3f94198e378f"
+ "reference": "a2e87c57a9843f07e8e6d6e57fe0fff965c0f4ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/390db30f686f3a7ab555178ac22d3f94198e378f",
- "reference": "390db30f686f3a7ab555178ac22d3f94198e378f",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/a2e87c57a9843f07e8e6d6e57fe0fff965c0f4ac",
+ "reference": "a2e87c57a9843f07e8e6d6e57fe0fff965c0f4ac",
"shasum": ""
},
"require": {
- "doctrine/common": "2.4.*",
+ "doctrine/common": ">=2.4,<2.6-dev",
"php": ">=5.3.2"
},
"require-dev": {
- "phpunit/phpunit": "3.7.*",
+ "phpunit/phpunit": "4.*",
"symfony/console": "2.*"
},
"suggest": {
- "symfony/console": "Allows use of the command line interface"
+ "symfony/console": "For helpful console commands such as SQL execution and import of files."
},
+ "bin": [
+ "bin/doctrine-dbal"
+ ],
"type": "library",
"extra": {
"branch-alias": {
@@ -445,23 +436,20 @@
],
"authors": [
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
}
],
"description": "Database Abstraction Layer",
@@ -472,34 +460,39 @@
"persistence",
"queryobject"
],
- "time": "2013-12-13 22:32:11"
+ "time": "2014-11-08 06:30:07"
},
{
"name": "doctrine/doctrine-bundle",
"version": "dev-master",
- "target-dir": "Doctrine/Bundle/DoctrineBundle",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "c65e5a21d1db794511d11fe28918f41bd6072f8f"
+ "reference": "d9763ccbb637958133c42bdcc3d31c5a6821b9e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c65e5a21d1db794511d11fe28918f41bd6072f8f",
- "reference": "c65e5a21d1db794511d11fe28918f41bd6072f8f",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d9763ccbb637958133c42bdcc3d31c5a6821b9e2",
+ "reference": "d9763ccbb637958133c42bdcc3d31c5a6821b9e2",
"shasum": ""
},
"require": {
- "doctrine/dbal": ">=2.2,<2.6-dev",
+ "doctrine/dbal": "~2.3",
+ "doctrine/doctrine-cache-bundle": "~1.0",
"jdorn/sql-formatter": "~1.1",
"php": ">=5.3.2",
"symfony/doctrine-bridge": "~2.2",
"symfony/framework-bundle": "~2.2"
},
"require-dev": {
- "doctrine/orm": "~2.2",
+ "doctrine/orm": "~2.3",
+ "phpunit/php-code-coverage": "~1.2",
+ "phpunit/phpunit": "~3.7",
+ "phpunit/phpunit-mock-objects": "~1.2",
+ "satooshi/php-coveralls": "~0.6.1",
"symfony/validator": "~2.2",
- "symfony/yaml": "~2.2"
+ "symfony/yaml": "~2.2",
+ "twig/twig": "~1"
},
"suggest": {
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
@@ -508,12 +501,12 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Bundle\\DoctrineBundle": ""
+ "psr-4": {
+ "Doctrine\\Bundle\\DoctrineBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -522,16 +515,20 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Doctrine Project",
+ "homepage": "http://www.doctrine-project.org/"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony DoctrineBundle",
@@ -542,26 +539,42 @@
"orm",
"persistence"
],
- "time": "2013-11-25 17:33:45"
+ "time": "2014-10-04 16:13:24"
},
{
- "name": "doctrine/inflector",
+ "name": "doctrine/doctrine-cache-bundle",
"version": "dev-master",
+ "target-dir": "Doctrine/Bundle/DoctrineCacheBundle",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/inflector.git",
- "reference": "8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c"
+ "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
+ "reference": "03b4890d61580d1bee710445abdf158bb224b251"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c",
- "reference": "8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c",
+ "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/03b4890d61580d1bee710445abdf158bb224b251",
+ "reference": "03b4890d61580d1bee710445abdf158bb224b251",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "doctrine/cache": "~1.3",
+ "doctrine/inflector": "~1.0",
+ "php": ">=5.3.2",
+ "symfony/doctrine-bridge": "~2.2",
+ "symfony/framework-bundle": "~2.2",
+ "symfony/security": "~2.2"
},
- "type": "library",
+ "require-dev": {
+ "instaclick/coding-standard": "~1.1",
+ "instaclick/object-calisthenics-sniffs": "dev-master",
+ "instaclick/symfony2-coding-standard": "dev-remaster",
+ "phpunit/phpunit": "~3.7",
+ "satooshi/php-coveralls": "~0.6.1",
+ "squizlabs/php_codesniffer": "dev-master",
+ "symfony/validator": "~2.2",
+ "symfony/yaml": "~2.2"
+ },
+ "type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
@@ -569,7 +582,7 @@
},
"autoload": {
"psr-0": {
- "Doctrine\\Common\\Inflector\\": "lib/"
+ "Doctrine\\Bundle\\DoctrineCacheBundle": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -578,16 +591,75 @@
],
"authors": [
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/"
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Fabio B. Silva",
+ "email": "fabio.bat.silva@gmail.com"
},
{
"name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
+ "email": "guilhermeblanco@hotmail.com"
},
{
+ "name": "Doctrine Project",
+ "homepage": "http://www.doctrine-project.org/"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "Symfony2 Bundle for Doctrine Cache",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "cache",
+ "caching"
+ ],
+ "time": "2014-07-30 14:46:58"
+ },
+ {
+ "name": "doctrine/inflector",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/inflector.git",
+ "reference": "8a0b96e65d2399d6f95b75de11134843a2c61feb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/8a0b96e65d2399d6f95b75de11134843a2c61feb",
+ "reference": "8a0b96e65d2399d6f95b75de11134843a2c61feb",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Doctrine\\Common\\Inflector\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
@@ -596,10 +668,16 @@
"email": "kontakt@beberlei.de"
},
{
- "name": "Johannes M. Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Common String Manipulations with regard to casing and singular/plural rules.",
@@ -610,7 +688,61 @@
"singularize",
"string"
],
- "time": "2013-04-10 16:14:30"
+ "time": "2014-10-05 18:49:49"
+ },
+ {
+ "name": "doctrine/instantiator",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/instantiator.git",
+ "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
+ "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3,<8.0-DEV"
+ },
+ "require-dev": {
+ "athletic/athletic": "~0.1.8",
+ "ext-pdo": "*",
+ "ext-phar": "*",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Doctrine\\Instantiator\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com",
+ "homepage": "http://ocramius.github.com/"
+ }
+ ],
+ "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+ "homepage": "https://github.com/doctrine/instantiator",
+ "keywords": [
+ "constructor",
+ "instantiate"
+ ],
+ "time": "2014-10-13 12:58:55"
},
{
"name": "doctrine/lexer",
@@ -618,12 +750,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "57d5a024b48709c56ce5bb93072948359220f36c"
+ "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/57d5a024b48709c56ce5bb93072948359220f36c",
- "reference": "57d5a024b48709c56ce5bb93072948359220f36c",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+ "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
"shasum": ""
},
"require": {
@@ -646,19 +778,16 @@
],
"authors": [
{
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
@@ -667,7 +796,7 @@
"lexer",
"parser"
],
- "time": "2013-11-19 06:15:26"
+ "time": "2014-09-09 13:34:57"
},
{
"name": "doctrine/migrations",
@@ -675,12 +804,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
- "reference": "ce2ffa17a642267d48b9df6c5eba94e9d773e22f"
+ "reference": "f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/migrations/zipball/ce2ffa17a642267d48b9df6c5eba94e9d773e22f",
- "reference": "ce2ffa17a642267d48b9df6c5eba94e9d773e22f",
+ "url": "https://api.github.com/repos/doctrine/migrations/zipball/f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0",
+ "reference": "f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0",
"shasum": ""
},
"require": {
@@ -711,14 +840,12 @@
],
"authors": [
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
}
],
"description": "Database Schema migrations using Doctrine DBAL",
@@ -727,7 +854,7 @@
"database",
"migrations"
],
- "time": "2013-12-03 00:28:34"
+ "time": "2014-10-30 14:49:25"
},
{
"name": "doctrine/orm",
@@ -735,24 +862,26 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
- "reference": "423ea00539d11e9a12e952a7e9144bd2c53019dc"
+ "reference": "76e1a469ef3c4af4ef9d60c769822d4283809217"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/423ea00539d11e9a12e952a7e9144bd2c53019dc",
- "reference": "423ea00539d11e9a12e952a7e9144bd2c53019dc",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/76e1a469ef3c4af4ef9d60c769822d4283809217",
+ "reference": "76e1a469ef3c4af4ef9d60c769822d4283809217",
"shasum": ""
},
"require": {
- "doctrine/collections": "~1.1",
+ "doctrine/collections": "~1.2",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
+ "doctrine/instantiator": "~1.0.1",
"ext-pdo": "*",
"php": ">=5.3.2",
- "symfony/console": "2.*"
+ "symfony/console": "~2.3"
},
"require-dev": {
+ "phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "dev-master",
- "symfony/yaml": "2.1"
+ "symfony/yaml": "~2.1"
},
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
@@ -778,23 +907,20 @@
],
"authors": [
{
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/",
- "role": "Creator"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
- {
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
}
],
"description": "Object-Relational-Mapper for PHP",
@@ -803,7 +929,7 @@
"database",
"orm"
],
- "time": "2013-12-17 18:39:36"
+ "time": "2014-11-05 12:19:29"
},
{
"name": "friendsofsymfony/rest-bundle",
@@ -888,12 +1014,12 @@
"source": {
"type": "git",
"url": "https://github.com/Incenteev/ParameterHandler.git",
- "reference": "143272a0a09c62616a3c8011fc165a10c6b35241"
+ "reference": "ea15f3dd22e5720eec244afb9bf2d5737a0b6c76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/143272a0a09c62616a3c8011fc165a10c6b35241",
- "reference": "143272a0a09c62616a3c8011fc165a10c6b35241",
+ "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/ea15f3dd22e5720eec244afb9bf2d5737a0b6c76",
+ "reference": "ea15f3dd22e5720eec244afb9bf2d5737a0b6c76",
"shasum": ""
},
"require": {
@@ -931,7 +1057,7 @@
"keywords": [
"parameters management"
],
- "time": "2013-12-07 10:10:39"
+ "time": "2014-08-20 22:30:03"
},
{
"name": "jdorn/sql-formatter",
@@ -939,12 +1065,12 @@
"source": {
"type": "git",
"url": "https://github.com/jdorn/sql-formatter.git",
- "reference": "8859d664737492d313c34796731b35eca851b362"
+ "reference": "ff0515fa8ce7d97d6cba279e8ed9d51d3eaa0316"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/8859d664737492d313c34796731b35eca851b362",
- "reference": "8859d664737492d313c34796731b35eca851b362",
+ "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/ff0515fa8ce7d97d6cba279e8ed9d51d3eaa0316",
+ "reference": "ff0515fa8ce7d97d6cba279e8ed9d51d3eaa0316",
"shasum": ""
},
"require": {
@@ -953,6 +1079,9 @@
"require-dev": {
"phpunit/phpunit": "3.7.*"
},
+ "bin": [
+ "bin/sql-formatter"
+ ],
"type": "library",
"extra": {
"branch-alias": {
@@ -981,7 +1110,7 @@
"highlight",
"sql"
],
- "time": "2013-11-27 22:51:13"
+ "time": "2014-07-28 13:45:38"
},
{
"name": "jms/metadata",
@@ -989,12 +1118,12 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/metadata.git",
- "reference": "814f758e0e1e37377a03b737a9270a63291c004b"
+ "reference": "22b72455559a25777cfd28c4ffda81ff7639f353"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/814f758e0e1e37377a03b737a9270a63291c004b",
- "reference": "814f758e0e1e37377a03b737a9270a63291c004b",
+ "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353",
+ "reference": "22b72455559a25777cfd28c4ffda81ff7639f353",
"shasum": ""
},
"require": {
@@ -1020,9 +1149,9 @@
],
"authors": [
{
- "name": "Johannes M. Schmitt",
+ "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
+ "homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1033,7 +1162,7 @@
"xml",
"yaml"
],
- "time": "2013-12-15 13:29:10"
+ "time": "2014-07-12 07:13:19"
},
{
"name": "jms/parser-lib",
@@ -1041,12 +1170,12 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/parser-lib.git",
- "reference": "d5961fa3fa039aa5ee0e50021c6681ba949e360c"
+ "reference": "6067cc609074ae215b96dc51047affee65f77b0f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/d5961fa3fa039aa5ee0e50021c6681ba949e360c",
- "reference": "d5961fa3fa039aa5ee0e50021c6681ba949e360c",
+ "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/6067cc609074ae215b96dc51047affee65f77b0f",
+ "reference": "6067cc609074ae215b96dc51047affee65f77b0f",
"shasum": ""
},
"require": {
@@ -1068,7 +1197,7 @@
"Apache2"
],
"description": "A library for easily creating recursive-descent parsers.",
- "time": "2013-08-09 15:53:02"
+ "time": "2014-07-08 16:40:41"
},
{
"name": "jms/serializer",
@@ -1076,12 +1205,12 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/serializer.git",
- "reference": "64d99274c2014cadac14406138d785126c10c312"
+ "reference": "d1cb450e67247aa6839032d39c3b800f9a7baf3d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/64d99274c2014cadac14406138d785126c10c312",
- "reference": "64d99274c2014cadac14406138d785126c10c312",
+ "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/d1cb450e67247aa6839032d39c3b800f9a7baf3d",
+ "reference": "d1cb450e67247aa6839032d39c3b800f9a7baf3d",
"shasum": ""
},
"require": {
@@ -1089,17 +1218,17 @@
"jms/metadata": "~1.1",
"jms/parser-lib": "1.*",
"php": ">=5.3.2",
- "phpcollection/phpcollection": ">=0.1,<0.3-dev"
+ "phpcollection/phpcollection": "~0.1"
},
"require-dev": {
- "doctrine/orm": ">=2.1,<2.4-dev",
+ "doctrine/orm": "~2.1",
"doctrine/phpcr-odm": "~1.0.1",
"jackalope/jackalope-doctrine-dbal": "1.0.*",
"propel/propel1": "~1.7",
"symfony/filesystem": "2.*",
- "symfony/form": ">=2.1,<2.2-dev",
- "symfony/translation": ">=2.0,<2.2-dev",
- "symfony/validator": ">=2.0,<2.2-dev",
+ "symfony/form": "~2.1",
+ "symfony/translation": "~2.0",
+ "symfony/validator": "~2.0",
"symfony/yaml": "2.*",
"twig/twig": ">=1.8,<2.0-dev"
},
@@ -1109,7 +1238,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.14-dev"
+ "dev-master": "0.17-dev"
}
},
"autoload": {
@@ -1124,9 +1253,7 @@
"authors": [
{
"name": "Johannes M. Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
@@ -1138,7 +1265,7 @@
"serialization",
"xml"
],
- "time": "2013-12-16 22:43:38"
+ "time": "2014-09-22 10:01:27"
},
{
"name": "jms/serializer-bundle",
@@ -1216,12 +1343,12 @@
"source": {
"type": "git",
"url": "https://github.com/kriswallsmith/assetic.git",
- "reference": "5e519fd750ea54a035386562ae03716ffba7014c"
+ "reference": "eb82167d176eb40078469ef9408ff56fd32a5d66"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/5e519fd750ea54a035386562ae03716ffba7014c",
- "reference": "5e519fd750ea54a035386562ae03716ffba7014c",
+ "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/eb82167d176eb40078469ef9408ff56fd32a5d66",
+ "reference": "eb82167d176eb40078469ef9408ff56fd32a5d66",
"shasum": ""
},
"require": {
@@ -1236,7 +1363,9 @@
"leafo/scssphp": "*",
"leafo/scssphp-compass": "*",
"mrclay/minify": "*",
- "phpunit/phpunit": "~3.7",
+ "patchwork/jsqueeze": "~1.0",
+ "phpunit/phpunit": "~4",
+ "psr/log": "~1.0",
"ptachoire/cssembed": "*",
"twig/twig": "~1.6"
},
@@ -1244,6 +1373,7 @@
"leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
"leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
"leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin",
+ "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor",
"ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
"twig/twig": "Assetic provides the integration with the Twig templating engine"
},
@@ -1279,7 +1409,7 @@
"compression",
"minification"
],
- "time": "2013-12-14 01:45:39"
+ "time": "2014-10-30 11:33:12"
},
{
"name": "monolog/monolog",
@@ -1287,44 +1417,50 @@
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "c9db00f8821b2cc7238732529f8d4007296a630c"
+ "reference": "53c6cf358bf50a3d31a003639245dac1d4de694b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c9db00f8821b2cc7238732529f8d4007296a630c",
- "reference": "c9db00f8821b2cc7238732529f8d4007296a630c",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/53c6cf358bf50a3d31a003639245dac1d4de694b",
+ "reference": "53c6cf358bf50a3d31a003639245dac1d4de694b",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
},
+ "provide": {
+ "psr/log-implementation": "1.0.0"
+ },
"require-dev": {
- "aws/aws-sdk-php": "~2.4.8",
- "doctrine/couchdb": "dev-master",
- "mlehner/gelf-php": "1.0.*",
+ "aws/aws-sdk-php": "~2.4, >2.4.8",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
"phpunit/phpunit": "~3.7.0",
- "raven/raven": "0.5.*",
- "ruflin/elastica": "0.90.*"
+ "raven/raven": "~0.5",
+ "ruflin/elastica": "0.90.*",
+ "videlalvaro/php-amqplib": "~2.4"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
- "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
"raven/raven": "Allow sending log messages to a Sentry server",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.11.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Monolog": "src/"
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1335,8 +1471,7 @@
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
- "homepage": "http://seld.be",
- "role": "Developer"
+ "homepage": "http://seld.be"
}
],
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
@@ -1346,7 +1481,7 @@
"logging",
"psr-3"
],
- "time": "2013-12-14 13:52:08"
+ "time": "2014-10-29 06:32:01"
},
{
"name": "nelmio/api-doc-bundle",
@@ -1429,12 +1564,12 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-collection.git",
- "reference": "dbec93115a5ff149b476ee2d4ede3880239a3d77"
+ "reference": "94a2c04376f49c12d5936b16d846579a1b3605bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/dbec93115a5ff149b476ee2d4ede3880239a3d77",
- "reference": "dbec93115a5ff149b476ee2d4ede3880239a3d77",
+ "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/94a2c04376f49c12d5936b16d846579a1b3605bc",
+ "reference": "94a2c04376f49c12d5936b16d846579a1b3605bc",
"shasum": ""
},
"require": {
@@ -1443,7 +1578,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.2-dev"
+ "dev-master": "0.4-dev"
}
},
"autoload": {
@@ -1457,9 +1592,9 @@
],
"authors": [
{
- "name": "Johannes M. Schmitt",
+ "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
+ "homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1471,20 +1606,20 @@
"sequence",
"set"
],
- "time": "2013-12-13 09:27:51"
+ "time": "2014-04-11 10:32:20"
},
{
"name": "phpoption/phpoption",
- "version": "dev-master",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941"
+ "reference": "5d099bcf0393908bf4ad69cc47dafb785d51f7f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/1c7e8016289d17d83ced49c56d0f266fd0568941",
- "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/5d099bcf0393908bf4ad69cc47dafb785d51f7f5",
+ "reference": "5d099bcf0393908bf4ad69cc47dafb785d51f7f5",
"shasum": ""
},
"require": {
@@ -1507,9 +1642,9 @@
],
"authors": [
{
- "name": "Johannes M. Schmitt",
+ "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
- "homepage": "http://jmsyst.com",
+ "homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1520,7 +1655,7 @@
"php",
"type"
],
- "time": "2013-05-19 11:09:35"
+ "time": "2014-01-09 22:37:17"
},
{
"name": "psr/log",
@@ -1528,12 +1663,12 @@
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "5144da9525d24346bf009ff28f10cbaa1f0f166e"
+ "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/5144da9525d24346bf009ff28f10cbaa1f0f166e",
- "reference": "5144da9525d24346bf009ff28f10cbaa1f0f166e",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/a78d6504ff5d4367497785ab2ade91db3a9fbe11",
+ "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11",
"shasum": ""
},
"type": "library",
@@ -1563,21 +1698,21 @@
"psr",
"psr-3"
],
- "time": "2013-12-05 15:25:07"
+ "time": "2014-01-18 15:33:09"
},
{
"name": "sensio/distribution-bundle",
- "version": "dev-master",
+ "version": "2.3.x-dev",
"target-dir": "Sensio/Bundle/DistributionBundle",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "cf0179711b24d84d4a29d71a4010540f4c990bd8"
+ "reference": "715fcb65f9a4841ffaf40c0bf050329d74c84cad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/cf0179711b24d84d4a29d71a4010540f4c990bd8",
- "reference": "cf0179711b24d84d4a29d71a4010540f4c990bd8",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/715fcb65f9a4841ffaf40c0bf050329d74c84cad",
+ "reference": "715fcb65f9a4841ffaf40c0bf050329d74c84cad",
"shasum": ""
},
"require": {
@@ -1609,7 +1744,7 @@
"configuration",
"distribution"
],
- "time": "2013-12-16 06:18:38"
+ "time": "2014-09-03 12:25:05"
},
{
"name": "sensio/framework-extra-bundle",
@@ -1618,12 +1753,12 @@
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "62e45cd2d4eb5e50265fe0329d59ef8a2163e500"
+ "reference": "f9e4c9794fb2624bcdee302109896d990bacddec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/62e45cd2d4eb5e50265fe0329d59ef8a2163e500",
- "reference": "62e45cd2d4eb5e50265fe0329d59ef8a2163e500",
+ "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/f9e4c9794fb2624bcdee302109896d990bacddec",
+ "reference": "f9e4c9794fb2624bcdee302109896d990bacddec",
"shasum": ""
},
"require": {
@@ -1648,7 +1783,9 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
}
],
"description": "This bundle provides a way to configure your controllers with annotations",
@@ -1656,7 +1793,7 @@
"annotations",
"controllers"
],
- "time": "2013-12-12 11:16:36"
+ "time": "2014-03-14 07:43:23"
},
{
"name": "sensio/generator-bundle",
@@ -1665,12 +1802,12 @@
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "38cce07d6b27d8ac2b6000560309f0cd5ce63577"
+ "reference": "ca3ae93fbac413dedf9cda716d4f7b35a162e6e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/38cce07d6b27d8ac2b6000560309f0cd5ce63577",
- "reference": "38cce07d6b27d8ac2b6000560309f0cd5ce63577",
+ "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ca3ae93fbac413dedf9cda716d4f7b35a162e6e9",
+ "reference": "ca3ae93fbac413dedf9cda716d4f7b35a162e6e9",
"shasum": ""
},
"require": {
@@ -1685,7 +1822,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "2.4.x-dev"
}
},
"autoload": {
@@ -1704,29 +1841,32 @@
}
],
"description": "This bundle generates code for you",
- "time": "2013-11-25 20:47:16"
+ "time": "2014-09-26 05:59:17"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.0.3",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230"
+ "reference": "d0f361d88e5de851bbb8c542d3b6aa46d61a9ffc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/32edc3b0de0fdc1b10f5c4912e8677b3f411a230",
- "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d0f361d88e5de851bbb8c542d3b6aa46d61a9ffc",
+ "reference": "d0f361d88e5de851bbb8c542d3b6aa46d61a9ffc",
"shasum": ""
},
"require": {
- "php": ">=5.2.4"
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.3-dev"
}
},
"autoload": {
@@ -1740,11 +1880,11 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Chris Corbyn"
},
{
- "name": "Chris Corbyn"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Swiftmailer, free feature-rich PHP mailer",
@@ -1753,50 +1893,50 @@
"mail",
"mailer"
],
- "time": "2013-12-03 13:33:24"
+ "time": "2014-10-30 13:41:35"
},
{
"name": "symfony/assetic-bundle",
"version": "dev-master",
- "target-dir": "Symfony/Bundle/AsseticBundle",
"source": {
"type": "git",
"url": "https://github.com/symfony/AsseticBundle.git",
- "reference": "82d5431a14cc7ec9ef3a1fcb3b452ac39d749831"
+ "reference": "90ea7fb66d6d5245fd4afc16e4c8070214254fec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/82d5431a14cc7ec9ef3a1fcb3b452ac39d749831",
- "reference": "82d5431a14cc7ec9ef3a1fcb3b452ac39d749831",
+ "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/90ea7fb66d6d5245fd4afc16e4c8070214254fec",
+ "reference": "90ea7fb66d6d5245fd4afc16e4c8070214254fec",
"shasum": ""
},
"require": {
"kriswallsmith/assetic": "~1.2",
"php": ">=5.3.0",
- "symfony/framework-bundle": "~2.1"
+ "symfony/console": "~2.1",
+ "symfony/framework-bundle": "~2.1",
+ "symfony/yaml": "~2.1"
},
"require-dev": {
+ "kriswallsmith/spork": "~0.2",
+ "patchwork/jsqueeze": "~1.0",
"symfony/class-loader": "~2.1",
- "symfony/console": "~2.1",
"symfony/css-selector": "~2.1",
"symfony/dom-crawler": "~2.1",
- "symfony/form": "~2.1",
- "symfony/twig-bundle": "~2.1",
- "symfony/yaml": "~2.1"
+ "symfony/twig-bundle": "~2.1"
},
"suggest": {
- "kriswallsmith/spork": "v0.2",
- "symfony/twig-bundle": "~2.1"
+ "kriswallsmith/spork": "to be able to dump assets in parallel",
+ "symfony/twig-bundle": "to use the Twig integration"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
- "psr-0": {
- "Symfony\\Bundle\\AsseticBundle": ""
+ "psr-4": {
+ "Symfony\\Bundle\\AsseticBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1817,73 +1957,24 @@
"compression",
"minification"
],
- "time": "2013-12-04 10:40:40"
- },
- {
- "name": "symfony/icu",
- "version": "1.2.x-dev",
- "target-dir": "Symfony/Component/Icu",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Icu.git",
- "reference": "98e197da54df1f966dd5e8a4992135703569c987"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Icu/zipball/98e197da54df1f966dd5e8a4992135703569c987",
- "reference": "98e197da54df1f966dd5e8a4992135703569c987",
- "shasum": ""
- },
- "require": {
- "lib-icu": ">=4.4",
- "php": ">=5.3.3",
- "symfony/intl": "~2.3"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Icu\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "Contains an excerpt of the ICU data and classes to load it.",
- "homepage": "http://symfony.com",
- "keywords": [
- "icu",
- "intl"
- ],
- "time": "2013-10-04 10:06:38"
+ "time": "2014-10-15 12:03:38"
},
{
"name": "symfony/monolog-bundle",
"version": "dev-master",
- "target-dir": "Symfony/Bundle/MonologBundle",
"source": {
"type": "git",
"url": "https://github.com/symfony/MonologBundle.git",
- "reference": "fc178515164e05099f618025c842abfa79313cad"
+ "reference": "cff4dc5326530b1abdde7a2369645d8599c24dd3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/fc178515164e05099f618025c842abfa79313cad",
- "reference": "fc178515164e05099f618025c842abfa79313cad",
+ "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/cff4dc5326530b1abdde7a2369645d8599c24dd3",
+ "reference": "cff4dc5326530b1abdde7a2369645d8599c24dd3",
"shasum": ""
},
"require": {
- "monolog/monolog": "~1.6",
+ "monolog/monolog": "~1.8",
"php": ">=5.3.2",
"symfony/config": "~2.3",
"symfony/dependency-injection": "~2.3",
@@ -1897,12 +1988,12 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.4.x-dev"
+ "dev-master": "2.6.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Symfony\\Bundle\\MonologBundle": ""
+ "psr-4": {
+ "Symfony\\Bundle\\MonologBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1911,12 +2002,12 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony MonologBundle",
@@ -1925,26 +2016,25 @@
"log",
"logging"
],
- "time": "2013-11-23 10:14:37"
+ "time": "2014-10-10 11:20:49"
},
{
"name": "symfony/swiftmailer-bundle",
- "version": "v2.3.4",
- "target-dir": "Symfony/Bundle/SwiftmailerBundle",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/symfony/SwiftmailerBundle.git",
- "reference": "f5e5d12629c26a835c7aa1d74e2e041486b92d93"
+ "reference": "0479e02dccbdcff3b2a84078f005d7fc4879925f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/f5e5d12629c26a835c7aa1d74e2e041486b92d93",
- "reference": "f5e5d12629c26a835c7aa1d74e2e041486b92d93",
+ "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/0479e02dccbdcff3b2a84078f005d7fc4879925f",
+ "reference": "0479e02dccbdcff3b2a84078f005d7fc4879925f",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
- "swiftmailer/swiftmailer": ">=4.2.0,<5.1-dev",
+ "swiftmailer/swiftmailer": ">=4.2.0,~5.0",
"symfony/swiftmailer-bridge": "~2.1"
},
"require-dev": {
@@ -1953,15 +2043,18 @@
"symfony/http-kernel": "~2.1",
"symfony/yaml": "~2.1"
},
+ "suggest": {
+ "psr/log": "Allows logging"
+ },
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
- "psr-0": {
- "Symfony\\Bundle\\SwiftmailerBundle": ""
+ "psr-4": {
+ "Symfony\\Bundle\\SwiftmailerBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1970,17 +2063,17 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
- "time": "2013-08-22 13:32:58"
+ "time": "2014-10-04 11:27:34"
},
{
"name": "symfony/symfony",
@@ -1988,20 +2081,19 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "67ae8fab191eb808787ae9e6aac1470b4298dd86"
+ "reference": "f1c34f937dd4b62a19e54417c62df7ac0189b3ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/67ae8fab191eb808787ae9e6aac1470b4298dd86",
- "reference": "67ae8fab191eb808787ae9e6aac1470b4298dd86",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/f1c34f937dd4b62a19e54417c62df7ac0189b3ca",
+ "reference": "f1c34f937dd4b62a19e54417c62df7ac0189b3ca",
"shasum": ""
},
"require": {
"doctrine/common": "~2.2",
"php": ">=5.3.3",
"psr/log": "~1.0",
- "symfony/icu": "~1.0",
- "twig/twig": "~1.11"
+ "twig/twig": "~1.12"
},
"replace": {
"symfony/browser-kit": "self.version",
@@ -2010,6 +2102,7 @@
"symfony/console": "self.version",
"symfony/css-selector": "self.version",
"symfony/debug": "self.version",
+ "symfony/debug-bundle": "self.version",
"symfony/dependency-injection": "self.version",
"symfony/doctrine-bridge": "self.version",
"symfony/dom-crawler": "self.version",
@@ -2044,22 +2137,25 @@
"symfony/twig-bridge": "self.version",
"symfony/twig-bundle": "self.version",
"symfony/validator": "self.version",
+ "symfony/var-dumper": "self.version",
"symfony/web-profiler-bundle": "self.version",
"symfony/yaml": "self.version"
},
"require-dev": {
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.2",
+ "doctrine/doctrine-bundle": "~1.2",
"doctrine/orm": "~2.2,>=2.2.3",
+ "egulias/email-validator": "~1.2",
"ircmaxell/password-compat": "1.0.*",
- "monolog/monolog": "~1.3",
- "ocramius/proxy-manager": ">=0.3.1,<0.5-dev",
+ "monolog/monolog": "~1.11",
+ "ocramius/proxy-manager": ">=0.3.1,<0.6-dev",
"propel/propel1": "1.6.*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2080,12 +2176,12 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "The Symfony PHP framework",
@@ -2093,29 +2189,35 @@
"keywords": [
"framework"
],
- "time": "2013-12-17 12:58:30"
+ "time": "2014-11-06 19:46:11"
},
{
"name": "twig/extensions",
"version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/fabpot/Twig-extensions.git",
- "reference": "0fdc8ca874d415b65c7a0d31376cac9c9ed775af"
+ "url": "https://github.com/twigphp/Twig-extensions.git",
+ "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/0fdc8ca874d415b65c7a0d31376cac9c9ed775af",
- "reference": "0fdc8ca874d415b65c7a0d31376cac9c9ed775af",
+ "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
+ "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
"shasum": ""
},
"require": {
- "twig/twig": "~1.0"
+ "twig/twig": "~1.12"
+ },
+ "require-dev": {
+ "symfony/translation": "~2.3"
+ },
+ "suggest": {
+ "symfony/translation": "Allow the time_diff output to be translated"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -2134,26 +2236,25 @@
}
],
"description": "Common additional features for Twig that do not directly belong in core",
- "homepage": "https://github.com/fabpot/Twig-extensions",
+ "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
"keywords": [
- "debug",
"i18n",
"text"
],
- "time": "2013-11-27 18:19:39"
+ "time": "2014-10-30 14:30:03"
},
{
"name": "twig/twig",
"version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/fabpot/Twig.git",
- "reference": "6387fc457792f38189bdd5729b500772bbddfa4d"
+ "url": "https://github.com/twigphp/Twig.git",
+ "reference": "f8b6e918a7d8e073efe14cbed7ae02df40ef19ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fabpot/Twig/zipball/6387fc457792f38189bdd5729b500772bbddfa4d",
- "reference": "6387fc457792f38189bdd5729b500772bbddfa4d",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/f8b6e918a7d8e073efe14cbed7ae02df40ef19ed",
+ "reference": "f8b6e918a7d8e073efe14cbed7ae02df40ef19ed",
"shasum": ""
},
"require": {
@@ -2162,7 +2263,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.15-dev"
+ "dev-master": "1.16-dev"
}
},
"autoload": {
@@ -2177,11 +2278,19 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
},
{
"name": "Armin Ronacher",
- "email": "armin.ronacher@active-4.com"
+ "email": "armin.ronacher@active-4.com",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage": "http://twig.sensiolabs.org/contributors",
+ "role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
@@ -2189,20 +2298,20 @@
"keywords": [
"templating"
],
- "time": "2013-12-10 10:23:00"
+ "time": "2014-10-23 15:29:03"
},
{
"name": "willdurand/negotiation",
- "version": "1.0.3",
+ "version": "1.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/willdurand/Negotiation.git",
- "reference": "366e31cfc247946dfe8c622bc00041964e9b294f"
+ "reference": "94733e96952a1f57db600582a8221807bb6f100a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/366e31cfc247946dfe8c622bc00041964e9b294f",
- "reference": "366e31cfc247946dfe8c622bc00041964e9b294f",
+ "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/94733e96952a1f57db600582a8221807bb6f100a",
+ "reference": "94733e96952a1f57db600582a8221807bb6f100a",
"shasum": ""
},
"require": {
@@ -2239,24 +2348,19 @@
"header",
"negotiation"
],
- "time": "2013-11-26 14:42:16"
+ "time": "2014-05-16 12:31:56"
}
],
- "packages-dev": [
-
- ],
- "aliases": [
-
- ],
+ "packages-dev": [],
+ "aliases": [],
"minimum-stability": "dev",
"stability-flags": {
"cbsi/doctrine2-nestedset": 20,
"doctrine/migrations": 20
},
+ "prefer-stable": false,
"platform": {
"php": ">=5.3.3"
},
- "platform-dev": [
-
- ]
+ "platform-dev": []
}
diff --git a/documentation/developer/INSTALL-UBUNTU b/documentation/developer/INSTALL-UBUNTU
@@ -19,6 +19,18 @@ CONTENTS
- Partkeepr config
- Submitting code
+-------------
+PREREQUISITES
+-------------
+
+# Install apache, mysql, php, imagemagick and git
+apt-get install apache2 mysql-server mysql-client libapache2-mod-php5 php5-mysql php5-curl php5-cli php5-intl php-pear php5-imagick php5-xsl php-apc php5-dev imagemagick git
+
+# Install composer: Follow instructions on https://getcomposer.org/ and then run:
+
+composer.phar install
+
+# Resolve any errors
-------------
SYSTEM CONFIG
@@ -28,7 +40,7 @@ SYSTEM CONFIG
# Prefix all commands with 'sudo' or run as the root user.
# Install apache, mysql, php, imagemagick and git
-apt-get install apache2 mysql-server mysql-client libapache2-mod-php5 php5-mysql php5-curl php5-cli php-pear php5-imagick php5-xsl php-apc php5-dev imagemagick git
+apt-get install apache2 mysql-server mysql-client libapache2-mod-php5 php5-mysql php5-curl php5-cli php5-intl php-pear php5-imagick php5-xsl php-apc php5-dev imagemagick git
# On Ubuntu Server, you need to install ia32-libs (installed automatically on Ubuntu Desktop)
# Note: This is only required with 64-bit Ubuntu (not 32-bit)
