uppgrade to dev version (2013-02-18) and add admin generator bundl

app/SymfonyRequirements.php

@@ -41,11 +41,11 @@ class Requirement
     /**
      * Constructor that initializes the requirement.
      *
-     * @param Boolean      $fulfilled     Whether the requirement is fulfilled
-     * @param string       $testMessage   The message for testing the requirement
-     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
-     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
-     * @param Boolean      $optional      Whether this is only an optional recommendation not a mandatory requirement
+     * @param Boolean     $fulfilled   Whether the requirement is fulfilled
+     * @param string      $testMessage The message for testing the requirement
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $optional    Whether this is only an optional recommendation not a mandatory requirement
      */
     public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
     {
@@ -117,16 +117,16 @@ class PhpIniRequirement extends Requirement
     /**
      * Constructor that initializes the requirement.
      *
-     * @param string            $cfgName            The configuration name used for ini_get()
-     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+     * @param string           $cfgName    The configuration name used for ini_get()
+     * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
                                                     or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
-     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
                                                     This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
                                                     Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
-     * @param string|null       $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
-     * @param string|null       $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
-     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
-     * @param Boolean           $optional           Whether this is only an optional recommendation not a mandatory requirement
+     * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string|null $helpHtml    The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $optional    Whether this is only an optional recommendation not a mandatory requirement
      */
     public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false)
     {
@@ -193,10 +193,10 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds a mandatory requirement.
      *
-     * @param Boolean      $fulfilled     Whether the requirement is fulfilled
-     * @param string       $testMessage   The message for testing the requirement
-     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
-     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $fulfilled   Whether the requirement is fulfilled
+     * @param string      $testMessage The message for testing the requirement
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null)
     {
@@ -206,10 +206,10 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds an optional recommendation.
      *
-     * @param Boolean      $fulfilled     Whether the recommendation is fulfilled
-     * @param string       $testMessage   The message for testing the recommendation
-     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
-     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $fulfilled   Whether the recommendation is fulfilled
+     * @param string      $testMessage The message for testing the recommendation
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null)
     {
@@ -219,15 +219,15 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds a mandatory requirement in form of a php.ini configuration.
      *
-     * @param string            $cfgName            The configuration name used for ini_get()
-     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+     * @param string           $cfgName    The configuration name used for ini_get()
+     * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
                                                     or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
-     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
                                                     This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
                                                     Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
-     * @param string            $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
-     * @param string            $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
-     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param string      $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
     {
@@ -237,15 +237,15 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds an optional recommendation in form of a php.ini configuration.
      *
-     * @param string            $cfgName            The configuration name used for ini_get()
-     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+     * @param string           $cfgName    The configuration name used for ini_get()
+     * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
                                                     or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
-     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
                                                     This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
                                                     Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
-     * @param string            $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
-     * @param string            $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
-     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param string      $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
     {
@@ -430,8 +430,15 @@ class SymfonyRequirements extends RequirementCollection
         );
 
         if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
+            $timezones = array();
+            foreach (DateTimeZone::listAbbreviations() as $abbreviations) {
+                foreach ($abbreviations as $abbreviation) {
+                    $timezones[$abbreviation['timezone_id']] = true;
+                }
+            }
+
             $this->addRequirement(
-                (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
+                isset($timezones[date_default_timezone_get()]),
                 sprintf('Configured default timezone "%s" must be supported by your installation of PHP', date_default_timezone_get()),
                 'Your default timezone is not supported by PHP. Check for typos in your <strong>php.ini</strong> file and have a look at the list of deprecated timezones at <a href="http://php.net/manual/en/timezones.others.php">http://php.net/manual/en/timezones.others.php</a>.'
             );
@@ -495,6 +502,14 @@ class SymfonyRequirements extends RequirementCollection
             $this->addPhpIniRequirement(
                 'xdebug.scream', false, true
             );
+
+            $this->addPhpIniRecommendation(
+                'xdebug.max_nesting_level',
+                create_function('$cfgValue', 'return $cfgValue > 100;'),
+                true,
+                'xdebug.max_nesting_level should be above 100 in php.ini',
+                'Set "<strong>xdebug.max_nesting_level</strong>" to e.g. "<strong>250</strong>" in php.ini<a href="#phpini">*</a> to stop Xdebug\'s infinite recursion protection erroneously throwing a fatal error in your project.'
+            );
         }
 
         $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
@@ -518,7 +533,7 @@ class SymfonyRequirements extends RequirementCollection
             'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions',
             'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.'
         );
-        
+
         $this->addRecommendation(
             version_compare($installedPhpVersion, '5.3.8', '>='),
             'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156',

app/bootstrap.php.cache

@@ -265,8 +265,10 @@ class Container implements IntrospectableContainerInterface
             unset($this->scopedServices[$name]);
 
             foreach ($this->scopeChildren[$name] as $child) {
-                $services[$child] = $this->scopedServices[$child];
-                unset($this->scopedServices[$child]);
+                if (isset($this->scopedServices[$child])) {
+                    $services[$child] = $this->scopedServices[$child];
+                    unset($this->scopedServices[$child]);
+                }
             }
 
                         $this->services = call_user_func_array('array_diff_key', $services);
@@ -509,12 +511,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $classes;
     protected $errorReportingLevel;
 
-    const VERSION         = '2.1.7';
-    const VERSION_ID      = '20107';
+    const VERSION         = '2.1.8-DEV';
+    const VERSION_ID      = '20108';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '1';
-    const RELEASE_VERSION = '7';
-    const EXTRA_VERSION   = '';
+    const RELEASE_VERSION = '8';
+    const EXTRA_VERSION   = 'DEV';
 
     
     public function __construct($environment, $debug)

composer.json

@@ -1,4 +1,5 @@
 {
+    "minimum-stability": "dev",
     "name": "symfony/framework-standard-edition",
     "description": "The \"Symfony Standard Edition\" distribution",
     "autoload": {
@@ -20,11 +21,12 @@
         "jms/di-extra-bundle": "1.1.*",
         "kriswallsmith/assetic": "1.1.*@dev",
         
-        "friendsofsymfony/user-bundle": "*",
+        "friendsofsymfony/user-bundle": "v1.3.1",
         "doctrine/data-fixtures" : "dev-master",
         "doctrine/doctrine-fixtures-bundle": "dev-master",
         "stof/doctrine-extensions-bundle": "dev-master",
-        "gregwar/image-bundle": "dev-master"
+        "gregwar/image-bundle": "dev-master",
+        "cedriclombardot/admingenerator-generator-bundle": "dev-master"
     },
     "scripts": {
         "post-install-cmd": [

composer.lock

@@ -1,24 +1,134 @@
 {
-    "hash": "dbeb4a140c307cd5c7e1e896ef9fa0aa",
+    "hash": "cfa67943fb19431c371d189811089b42",
     "packages": [
         {
+            "name": "cedriclombardot/admingenerator-generator-bundle",
+            "version": "dev-master",
+            "target-dir": "Admingenerator/GeneratorBundle",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
+                "reference": "d50c391562cae6560e8d8003d3bd3a855d467490"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/d50c391562cae6560e8d8003d3bd3a855d467490",
+                "reference": "d50c391562cae6560e8d8003d3bd3a855d467490",
+                "shasum": ""
+            },
+            "require": {
+                "cedriclombardot/twig-generator": "dev-master",
+                "knplabs/knp-menu-bundle": ">1.0,<2.1",
+                "symfony/symfony": "2.1.*",
+                "twig/extensions": "dev-master",
+                "twig/twig": ">= 1.9.0",
+                "white-october/pagerfanta-bundle": "dev-master"
+            },
+            "require-dev": {
+                "doctrine/common": "2.3.*",
+                "doctrine/dbal": "2.3.*",
+                "doctrine/orm": "2.3.*"
+            },
+            "suggest": {
+                "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
+            },
+            "time": "2013-02-17 18:17:44",
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Admingenerator\\GeneratorBundle": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cedric LOMBARDOT",
+                    "email": "cedric.lombardot@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://github.com/cedriclombardot/AdmingeneratorGeneratorBundle/contributors"
+                }
+            ],
+            "description": "Admingenerator for Symfony2 based on YAML configuration and Twig templating",
+            "homepage": "http://symfony2admingenerator.org/",
+            "keywords": [
+                "admin",
+                "generator",
+                "yaml"
+            ]
+        },
+        {
+            "name": "cedriclombardot/twig-generator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/cedriclombardot/TwigGenerator.git",
+                "reference": "b4a846956d330ed464070f6276801d16c92ae5c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cedriclombardot/TwigGenerator/zipball/b4a846956d330ed464070f6276801d16c92ae5c5",
+                "reference": "b4a846956d330ed464070f6276801d16c92ae5c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "twig/twig": ">=1.1, <2.0-dev"
+            },
+            "time": "2012-11-09 23:18:09",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "TwigGenerator": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cédric Lombardot",
+                    "email": "cedric.lombardot@gmail.com"
+                },
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "A generator for PHP code based on Twig template engine",
+            "keywords": [
+                "code generation",
+                "generator",
+                "twig"
+            ]
+        },
+        {
             "name": "doctrine/common",
-            "version": "2.3.0",
+            "version": "2.3.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/common",
-                "reference": "2.3.0"
+                "url": "https://github.com/doctrine/common.git",
+                "reference": "bb0aebbf234db52df476a2b473d434745b34221c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/common/zipball/2.3.0",
-                "reference": "2.3.0",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c",
+                "reference": "bb0aebbf234db52df476a2b473d434745b34221c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
-            "time": "2012-09-19 22:55:18",
+            "time": "2012-09-20 05:55:18",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -127,23 +237,23 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "2.3.2",
+            "version": "2.3.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/dbal",
-                "reference": "2.3.2"
+                "url": "https://github.com/doctrine/dbal.git",
+                "reference": "fd45c6f6baa618d871f3201fabe76df5043abb1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/dbal/archive/2.3.2.zip",
-                "reference": "2.3.2",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/fd45c6f6baa618d871f3201fabe76df5043abb1e",
+                "reference": "fd45c6f6baa618d871f3201fabe76df5043abb1e",
                 "shasum": ""
             },
             "require": {
                 "doctrine/common": "2.3.*",
                 "php": ">=5.3.2"
             },
-            "time": "2013-01-07 20:03:43",
+            "time": "2013-01-20 11:50:36",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -190,17 +300,17 @@
         },
         {
             "name": "doctrine/doctrine-bundle",
-            "version": "v1.1.0",
+            "version": "1.1.x-dev",
             "target-dir": "Doctrine/Bundle/DoctrineBundle",
             "source": {
                 "type": "git",
                 "url": "git://github.com/doctrine/DoctrineBundle.git",
-                "reference": "v1.1.0"
+                "reference": "78b3680da8ae38f87df83a100e2e3a6820dd6177"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/DoctrineBundle/archive/v1.1.0.zip",
-                "reference": "v1.1.0",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/78b3680da8ae38f87df83a100e2e3a6820dd6177",
+                "reference": "78b3680da8ae38f87df83a100e2e3a6820dd6177",
                 "shasum": ""
             },
             "require": {
@@ -218,7 +328,7 @@
             "suggest": {
                 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle."
             },
-            "time": "2013-01-12 13:20:23",
+            "time": "2013-01-12 14:40:52",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -317,16 +427,16 @@
         },
         {
             "name": "doctrine/orm",
-            "version": "2.3.2",
+            "version": "2.3.x-dev",
             "source": {
                 "type": "git",
-                "url": "git://github.com/doctrine/doctrine2.git",
-                "reference": "2.3.2"
+                "url": "https://github.com/doctrine/doctrine2.git",
+                "reference": "fdd0af34e6fced967b8751bc3e4792c11ef86d57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/doctrine2/archive/2.3.2.zip",
-                "reference": "2.3.2",
+                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/fdd0af34e6fced967b8751bc3e4792c11ef86d57",
+                "reference": "fdd0af34e6fced967b8751bc3e4792c11ef86d57",
                 "shasum": ""
             },
             "require": {
@@ -338,7 +448,7 @@
             "suggest": {
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
             },
-            "time": "2013-01-07 20:05:04",
+            "time": "2013-01-20 19:35:21",
             "bin": [
                 "bin/doctrine",
                 "bin/doctrine.php"
@@ -452,16 +562,16 @@
         },
         {
             "name": "gedmo/doctrine-extensions",
-            "version": "v2.3.4",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "git://github.com/l3pp4rd/DoctrineExtensions.git",
-                "reference": "v2.3.4"
+                "reference": "b2806e409f21132e814203e36810b7112453a858"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/v2.3.4",
-                "reference": "v2.3.4",
+                "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/b2806e409f21132e814203e36810b7112453a858",
+                "reference": "b2806e409f21132e814203e36810b7112453a858",
                 "shasum": ""
             },
             "require": {
@@ -481,7 +591,7 @@
                 "doctrine/mongodb-odm": ">=1.0.0-BETA7",
                 "doctrine/orm": ">=2.3.2"
             },
-            "time": "2013-02-05 13:39:54",
+            "time": "2013-02-13 19:35:33",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -575,22 +685,22 @@
         },
         {
             "name": "jdorn/sql-formatter",
-            "version": "v1.2.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "git://github.com/jdorn/sql-formatter.git",
-                "reference": "v1.2.0"
+                "reference": "7a92826fe2734518e9cd6ebcf1ba052e58351c34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/jdorn/sql-formatter/archive/v1.2.0.zip",
-                "reference": "v1.2.0",
+                "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/7a92826fe2734518e9cd6ebcf1ba052e58351c34",
+                "reference": "7a92826fe2734518e9cd6ebcf1ba052e58351c34",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2012-12-22 21:46:50",
+            "time": "2013-02-11 00:21:20",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -707,7 +817,7 @@
         },
         {
             "name": "jms/di-extra-bundle",
-            "version": "1.1.1",
+            "version": "1.1.x-dev",
             "target-dir": "JMS/DiExtraBundle",
             "source": {
                 "type": "git",
@@ -716,7 +826,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/schmittjoh/JMSDiExtraBundle/archive/1.1.1.zip",
+                "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/1.1.1",
                 "reference": "1.1.1",
                 "shasum": ""
             },
@@ -740,7 +850,7 @@
                 "symfony/validator": "*",
                 "symfony/yaml": "*"
             },
-            "time": "2012-09-21 01:56:32",
+            "time": "2012-09-21 08:56:32",
             "type": "symfony-bundle",
             "autoload": {
                 "psr-0": {
@@ -812,17 +922,17 @@
         },
         {
             "name": "jms/security-extra-bundle",
-            "version": "1.2.0",
+            "version": "1.2.x-dev",
             "target-dir": "JMS/SecurityExtraBundle",
             "source": {
                 "type": "git",
-                "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle",
-                "reference": "1.2.0"
+                "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git",
+                "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/1.2.0",
-                "reference": "1.2.0",
+                "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb",
+                "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb",
                 "shasum": ""
             },
             "require": {
@@ -846,7 +956,7 @@
                 "symfony/validator": "*",
                 "symfony/yaml": "*"
             },
-            "time": "2012-09-06 09:12:03",
+            "time": "2012-09-06 16:12:23",
             "type": "symfony-bundle",
             "autoload": {
                 "psr-0": {
@@ -876,6 +986,124 @@
             ]
         },
         {
+            "name": "knplabs/knp-menu",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/KnpLabs/KnpMenu.git",
+                "reference": "730bc37232f5f813822acf80edfbd89381ea5971"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/730bc37232f5f813822acf80edfbd89381ea5971",
+                "reference": "730bc37232f5f813822acf80edfbd89381ea5971",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "pimple/pimple": "1.0.*",
+                "silex/silex": "1.0.*",
+                "twig/twig": ">=1.2,<2.0-dev"
+            },
+            "suggest": {
+                "pimple/pimple": "for the built-in implementations of the menu provider and renderer provider",
+                "silex/silex": "for the integration with your silex application",
+                "twig/twig": "for the TwigRenderer and the integration with your templates"
+            },
+            "time": "2012-12-27 13:04:16",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Knp\\Menu\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christophe Coevoet",
+                    "email": "stof@notk.org"
+                },
+                {
+                    "name": "KnpLabs",
+                    "homepage": "http://knplabs.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://github.com/KnpLabs/KnpMenu/contributors"
+                }
+            ],
+            "description": "An object oriented menu library",
+            "homepage": "http://knplabs.com",
+            "keywords": [
+                "menu",
+                "tree"
+            ]
+        },
+        {
+            "name": "knplabs/knp-menu-bundle",
+            "version": "dev-master",
+            "target-dir": "Knp/Bundle/MenuBundle",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/KnpLabs/KnpMenuBundle.git",
+                "reference": "bfaa9f1a74ee590c5e6460a3139b268fce1f1885"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/bfaa9f1a74ee590c5e6460a3139b268fce1f1885",
+                "reference": "bfaa9f1a74ee590c5e6460a3139b268fce1f1885",
+                "shasum": ""
+            },
+            "require": {
+                "knplabs/knp-menu": "2.0.*",
+                "symfony/framework-bundle": ">=2.0,<2.3-dev"
+            },
+            "time": "2012-12-29 08:47:58",
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Knp\\Bundle\\MenuBundle": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christophe Coevoet",
+                    "email": "stof@notk.org"
+                },
+                {
+                    "name": "Knplabs",
+                    "homepage": "http://knplabs.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://github.com/KnpLabs/KnpMenuBundle/contributors"
+                }
+            ],
+            "description": "This bundle provides an integration of the KnpMenu library",
+            "keywords": [
+                "menu"
+            ]
+        },
+        {
             "name": "kriswallsmith/assetic",
             "version": "dev-master",
             "source": {
@@ -1003,24 +1231,75 @@
             ]
         },
         {
+            "name": "pagerfanta/pagerfanta",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/whiteoctober/Pagerfanta.git",
+                "reference": "2608116b1d0908c07f6590bc10addab37fd4a49f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/2608116b1d0908c07f6590bc10addab37fd4a49f",
+                "reference": "2608116b1d0908c07f6590bc10addab37fd4a49f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "suggest": {
+                "doctrine/mongodb-odm": "2.*",
+                "doctrine/orm": "2.*",
+                "solarium/solarium": "2.*"
+            },
+            "time": "2013-02-17 21:13:14",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pagerfanta\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Pablo Díez",
+                    "email": "pablodip@gmail.com",
+                    "homepage": "http://github.com/pablodip"
+                }
+            ],
+            "description": "Pagination for PHP 5.3",
+            "keywords": [
+                "page",
+                "paging"
+            ]
+        },
+        {
             "name": "sensio/distribution-bundle",
-            "version": "v2.1.7",
+            "version": "2.1.x-dev",
             "target-dir": "Sensio/Bundle/DistributionBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioDistributionBundle",
-                "reference": "v2.1.7"
+                "reference": "615f76309dae8c45c72b69578b034713c09767d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sensio/SensioDistributionBundle/archive/v2.1.7.zip",
-                "reference": "v2.1.7",
+                "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/615f76309dae8c45c72b69578b034713c09767d1",
+                "reference": "615f76309dae8c45c72b69578b034713c09767d1",
                 "shasum": ""
             },
             "require": {
                 "symfony/framework-bundle": "2.1.*"
             },
-            "time": "2013-01-04 17:11:22",
+            "time": "2013-02-04 19:54:42",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1050,7 +1329,7 @@
         },
         {
             "name": "sensio/framework-extra-bundle",
-            "version": "v2.1.7",
+            "version": "2.1.x-dev",
             "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
             "source": {
                 "type": "git",
@@ -1059,7 +1338,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sensio/SensioFrameworkExtraBundle/archive/v2.1.7.zip",
+                "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.7",
                 "reference": "v2.1.7",
                 "shasum": ""
             },
@@ -1097,7 +1376,7 @@
         },
         {
             "name": "sensio/generator-bundle",
-            "version": "v2.1.7",
+            "version": "2.1.x-dev",
             "target-dir": "Sensio/Bundle/GeneratorBundle",
             "source": {
                 "type": "git",
@@ -1106,7 +1385,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sensio/SensioGeneratorBundle/archive/v2.1.7.zip",
+                "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.7",
                 "reference": "v2.1.7",
                 "shasum": ""
             },
@@ -1256,17 +1535,17 @@
         },
         {
             "name": "symfony/assetic-bundle",
-            "version": "v2.1.1",
+            "version": "dev-master",
             "target-dir": "Symfony/Bundle/AsseticBundle",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/AsseticBundle",
-                "reference": "v2.1.1"
+                "url": "https://github.com/symfony/AsseticBundle.git",
+                "reference": "16cb279ea283ce3fb30b8284a391a82512263d8b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/v2.1.1",
-                "reference": "v2.1.1",
+                "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/16cb279ea283ce3fb30b8284a391a82512263d8b",
+                "reference": "16cb279ea283ce3fb30b8284a391a82512263d8b",
                 "shasum": ""
             },
             "require": {
@@ -1286,7 +1565,7 @@
             "suggest": {
                 "symfony/twig-bundle": ">=2.1.0,<2.3-dev"
             },
-            "time": "2013-01-31 17:56:17",
+            "time": "2013-02-17 21:36:13",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1319,17 +1598,17 @@
         },
         {
             "name": "symfony/monolog-bundle",
-            "version": "v2.1.7",
+            "version": "2.1.x-dev",
             "target-dir": "Symfony/Bundle/MonologBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/MonologBundle",
-                "reference": "v2.1.7"
+                "reference": "253fcda1128a0301aa68d040302cade65095f2c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.1.7",
-                "reference": "v2.1.7",
+                "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/253fcda1128a0301aa68d040302cade65095f2c6",
+                "reference": "253fcda1128a0301aa68d040302cade65095f2c6",
                 "shasum": ""
             },
             "require": {
@@ -1337,13 +1616,13 @@
                 "php": ">=5.3.2",
                 "symfony/config": ">=2.1.0,<2.3-dev",
                 "symfony/dependency-injection": ">=2.1.0,<2.3-dev",
-                "symfony/monolog-bridge": ">=2.1.0,<2.3-dev"
+                "symfony/monolog-bridge": "2.1.*"
             },
             "require-dev": {
                 "symfony/config": ">=2.1.0,<2.3-dev",
                 "symfony/yaml": ">=2.1.0,<2.3-dev"
             },
-            "time": "2013-01-07 10:57:41",
+            "time": "2013-01-28 10:06:42",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1378,16 +1657,16 @@
         },
         {
             "name": "symfony/swiftmailer-bundle",
-            "version": "v2.1.7",
+            "version": "2.1.x-dev",
             "target-dir": "Symfony/Bundle/SwiftmailerBundle",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/SwiftmailerBundle",
+                "url": "https://github.com/symfony/SwiftmailerBundle.git",
                 "reference": "v2.1.7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/SwiftmailerBundle/archive/v2.1.7.zip",
+                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.7",
                 "reference": "v2.1.7",
                 "shasum": ""
             },
@@ -1433,16 +1712,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v2.1.7",
+            "version": "2.1.x-dev",
             "source": {
                 "type": "git",
-                "url": "git://github.com/symfony/symfony.git",
-                "reference": "v2.1.7"
+                "url": "https://github.com/symfony/symfony.git",
+                "reference": "75c61944a3e43b9efb5a195fd79416ff43ca09e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/symfony/archive/v2.1.7.zip",
-                "reference": "v2.1.7",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/75c61944a3e43b9efb5a195fd79416ff43ca09e7",
+                "reference": "75c61944a3e43b9efb5a195fd79416ff43ca09e7",
                 "shasum": ""
             },
             "require": {
@@ -1491,7 +1770,7 @@
                 "monolog/monolog": ">=1.0,<1.3-dev",
                 "propel/propel1": "dev-master"
             },
-            "time": "2013-01-17 21:21:51",
+            "time": "2013-02-17 12:59:26",
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -1568,22 +1847,22 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.12.2",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "git://github.com/fabpot/Twig.git",
-                "reference": "v1.12.2"
+                "url": "https://github.com/fabpot/Twig.git",
+                "reference": "ac86c6368c8b1ed27adb436af54d0398b64cab1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.2",
-                "reference": "v1.12.2",
+                "url": "https://api.github.com/repos/fabpot/Twig/zipball/ac86c6368c8b1ed27adb436af54d0398b64cab1f",
+                "reference": "ac86c6368c8b1ed27adb436af54d0398b64cab1f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2013-02-09 18:21:53",
+            "time": "2013-02-17 19:51:08",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1614,19 +1893,63 @@
             "keywords": [
                 "templating"
             ]
+        },
+        {
+            "name": "white-october/pagerfanta-bundle",
+            "version": "dev-master",
+            "target-dir": "WhiteOctober/PagerfantaBundle",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git",
+                "reference": "38e317a3ecd5a68e2322024ea8fe57632d4ddd68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/38e317a3ecd5a68e2322024ea8fe57632d4ddd68",
+                "reference": "38e317a3ecd5a68e2322024ea8fe57632d4ddd68",
+                "shasum": ""
+            },
+            "require": {
+                "pagerfanta/pagerfanta": "dev-master",
+                "symfony/framework-bundle": "2.*"
+            },
+            "time": "2012-07-24 12:48:41",
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-0": {
+                    "WhiteOctober\\PagerfantaBundle": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Pablo Díez",
+                    "email": "pablodip@gmail.com",
+                    "homepage": "http://github.com/pablodip"
+                }
+            ],
+            "description": "Bundle to use Pagerfanta with Symfony2",
+            "keywords": [
+                "page",
+                "paging"
+            ]
         }
     ],
     "packages-dev": null,
     "aliases": [
 
     ],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "stability-flags": {
         "twig/extensions": 20,
         "kriswallsmith/assetic": 20,
         "doctrine/data-fixtures": 20,
         "doctrine/doctrine-fixtures-bundle": 20,
         "stof/doctrine-extensions-bundle": 20,
-        "gregwar/image-bundle": 20
+        "gregwar/image-bundle": 20,
+        "cedriclombardot/admingenerator-generator-bundle": 20
     }
 }

vendor/autoload.php

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

vendor/cedriclombardot/admingenerator-generator-bundle/Admingenerator/GeneratorBundle

@@ -0,0 +1 @@
+Subproject commit d50c391562cae6560e8d8003d3bd3a855d467490

vendor/cedriclombardot/twig-generator

@@ -0,0 +1 @@
+Subproject commit b4a846956d330ed464070f6276801d16c92ae5c5

vendor/composer/autoload_namespaces.php

@@ -6,8 +6,10 @@ $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
+    'WhiteOctober\\PagerfantaBundle' => $vendorDir . '/white-october/pagerfanta-bundle/',
     'Twig_Extensions_' => $vendorDir . '/twig/extensions/lib/',
     'Twig_' => $vendorDir . '/twig/twig/lib/',
+    'TwigGenerator' => $vendorDir . '/cedriclombardot/twig-generator/src/',
     'Symfony\\Bundle\\SwiftmailerBundle' => $vendorDir . '/symfony/swiftmailer-bundle/',
     'Symfony\\Bundle\\MonologBundle' => $vendorDir . '/symfony/monolog-bundle/',
     'Symfony\\Bundle\\AsseticBundle' => $vendorDir . '/symfony/assetic-bundle/',
@@ -17,8 +19,11 @@ return array(
     'Sensio\\Bundle\\GeneratorBundle' => $vendorDir . '/sensio/generator-bundle/',
     'Sensio\\Bundle\\FrameworkExtraBundle' => $vendorDir . '/sensio/framework-extra-bundle/',
     'Sensio\\Bundle\\DistributionBundle' => $vendorDir . '/sensio/distribution-bundle/',
+    'Pagerfanta\\' => $vendorDir . '/pagerfanta/pagerfanta/src/',
     'Monolog' => $vendorDir . '/monolog/monolog/src/',
     'Metadata\\' => $vendorDir . '/jms/metadata/src/',
+    'Knp\\Menu\\' => $vendorDir . '/knplabs/knp-menu/src/',
+    'Knp\\Bundle\\MenuBundle' => $vendorDir . '/knplabs/knp-menu-bundle/',
     'JMS\\SecurityExtraBundle' => $vendorDir . '/jms/security-extra-bundle/',
     'JMS\\DiExtraBundle' => $vendorDir . '/jms/di-extra-bundle/',
     'JMS\\AopBundle' => $vendorDir . '/jms/aop-bundle/',
@@ -33,5 +38,6 @@ return array(
     'Doctrine\\Bundle\\DoctrineBundle' => $vendorDir . '/doctrine/doctrine-bundle/',
     'CG\\' => $vendorDir . '/jms/cg/src/',
     'Assetic' => $vendorDir . '/kriswallsmith/assetic/src/',
+    'Admingenerator\\GeneratorBundle' => $vendorDir . '/cedriclombardot/admingenerator-generator-bundle/',
     '' => $baseDir . '/src/',
 );

vendor/composer/autoload_real.php

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

vendor/doctrine/common/lib/Doctrine/Common/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.3.0';
+    const VERSION = '2.3.1-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

vendor/doctrine/dbal/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "doctrine/dbal",
-    "type": "library","version":"2.3.2",
+    "type": "library",
     "description": "Database Abstraction Layer",
     "keywords": ["dbal", "database", "persistence", "queryobject"],
     "homepage": "http://www.doctrine-project.org",

vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php

@@ -687,12 +687,12 @@ class SQLServerPlatform extends AbstractPlatform
 
                 // Remove ORDER BY clause from $query
                 $query = preg_replace('/\s+ORDER BY(.*)/', '', $query);
-                $query = preg_replace('/^SELECT\s/', '', $query);
+                $query = preg_replace('/\sFROM/i', ", ROW_NUMBER() OVER ($over) AS doctrine_rownum FROM", $query);
 
                 $start = $offset + 1;
                 $end = $offset + $limit;
 
-                $query = "SELECT * FROM (SELECT ROW_NUMBER() OVER ($over) AS doctrine_rownum, $query) AS doctrine_tbl WHERE doctrine_rownum BETWEEN $start AND $end";
+                $query = "SELECT * FROM ($query) AS doctrine_tbl WHERE doctrine_rownum BETWEEN $start AND $end";
             }
         }
 

vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php

@@ -32,6 +32,13 @@ use Doctrine\DBAL\Connection;
  */
 class SQLParserUtils
 {
+    const POSITIONAL_TOKEN = '\?';
+    const NAMED_TOKEN      = ':[a-zA-Z_][a-zA-Z0-9_]*';
+
+    // Quote characters within string literals can be preceded by a backslash.
+    const ESCAPED_SINGLE_QUOTED_TEXT = "'(?:[^'\\\\]|\\\\'|\\\\\\\\)*'";
+    const ESCAPED_DOUBLE_QUOTED_TEXT = '"(?:[^"\\\\]|\\\\"|\\\\\\\\)*"';
+
     /**
      * Get an array of the placeholders in an sql statements as keys and their positions in the query string.
      *
@@ -49,27 +56,18 @@ class SQLParserUtils
             return array();
         }
 
-        $count = 0;
-        $inLiteral = false; // a valid query never starts with quotes
-        $stmtLen = strlen($statement);
+        $token = ($isPositional) ? self::POSITIONAL_TOKEN : self::NAMED_TOKEN;
         $paramMap = array();
-        for ($i = 0; $i < $stmtLen; $i++) {
-            if ($statement[$i] == $match && !$inLiteral && ($isPositional || $statement[$i+1] != '=')) {
-                // real positional parameter detected
+
+        foreach (self::getUnquotedStatementFragments($statement) as $fragment) {
+            preg_match_all("/$token/", $fragment[0], $matches, PREG_OFFSET_CAPTURE);
+            foreach ($matches[0] as $placeholder) {
                 if ($isPositional) {
-                    $paramMap[$count] = $i;
+                    $paramMap[] = $placeholder[1] + $fragment[1];
                 } else {
-                    $name = "";
-                    // TODO: Something faster/better to match this than regex?
-                    for ($j = $i + 1; ($j < $stmtLen && preg_match('(([a-zA-Z0-9_]{1}))', $statement[$j])); $j++) {
-                        $name .= $statement[$j];
-                    }
-                    $paramMap[$i] = $name; // named parameters can be duplicated!
-                    $i = $j;
+                    $pos = $placeholder[1] + $fragment[1];
+                    $paramMap[$pos] = substr($placeholder[0], 1, strlen($placeholder[0]));
                 }
-                ++$count;
-            } else if ($statement[$i] == "'" || $statement[$i] == '"') {
-                $inLiteral = ! $inLiteral; // switch state!
             }
         }
 
@@ -180,4 +178,23 @@ class SQLParserUtils
 
         return array($query, $paramsOrd, $typesOrd);
     }
-}
+
+    /**
+     * Slice the SQL statement around pairs of quotes and
+     * return string fragments of SQL outside of quoted literals.
+     * Each fragment is captured as a 2-element array:
+     *
+     * 0 => matched fragment string,
+     * 1 => offset of fragment in $statement
+     *
+     * @param string $statement
+     * @return array
+     */
+    static private function getUnquotedStatementFragments($statement)
+    {
+        $literal = self::ESCAPED_SINGLE_QUOTED_TEXT . '|' . self::ESCAPED_DOUBLE_QUOTED_TEXT;
+        preg_match_all("/([^'\"]+)(?:$literal)?/s", $statement, $fragments, PREG_OFFSET_CAPTURE);
+
+        return $fragments[1];
+    }
+}

vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.3.2';
+    const VERSION = '2.3.3-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php

@@ -154,7 +154,7 @@ class SQLServerPlatformTest extends AbstractPlatformTestCase
     public function testModifyLimitQueryWithOffset()
     {
         $sql = $this->_platform->modifyLimitQuery('SELECT * FROM user ORDER BY username DESC', 10, 5);
-        $this->assertEquals('SELECT * FROM (SELECT ROW_NUMBER() OVER (ORDER BY username DESC) AS doctrine_rownum, * FROM user) AS doctrine_tbl WHERE doctrine_rownum BETWEEN 6 AND 15', $sql);
+        $this->assertEquals('SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY username DESC) AS doctrine_rownum FROM user) AS doctrine_tbl WHERE doctrine_rownum BETWEEN 6 AND 15', $sql);
     }
 
     public function testModifyLimitQueryWithAscOrderBy()

vendor/doctrine/dbal/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php

@@ -28,6 +28,13 @@ class SQLParserUtilsTest extends \Doctrine\Tests\DbalTestCase
             array("SELECT '?' FROM foo", true, array()),
             array('SELECT "?" FROM foo WHERE bar = ?', true, array(32)),
             array("SELECT '?' FROM foo WHERE bar = ?", true, array(32)),
+            array(
+<<<'SQLDATA'
+SELECT * FROM foo WHERE bar = 'it\'s a trap? \\' OR bar = ?
+AND baz = "\"quote\" me on it? \\" OR baz = ?
+SQLDATA
+                , true, array(58, 104)
+            ),
 
             // named
             array('SELECT :foo FROM :bar', false, array(7 => 'foo', 17 => 'bar')),
@@ -37,6 +44,7 @@ class SQLParserUtilsTest extends \Doctrine\Tests\DbalTestCase
             array('SELECT :foo_id', false, array(7 => 'foo_id')), // Ticket DBAL-231
             array('SELECT @rank := 1', false, array()), // Ticket DBAL-398
             array('SELECT @rank := 1 AS rank, :foo AS foo FROM :bar', false, array(27 => 'foo', 44 => 'bar')), // Ticket DBAL-398
+            array('SELECT * FROM Foo WHERE bar > :start_date AND baz > :start_date', false, array(30 => 'start_date', 52 =>  'start_date')) // Ticket GH-113
         );
     }
 

vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/.travis.yml

@@ -3,6 +3,10 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 
-before_script: composer install --dev
+matrix:
+  allow_failures:
+    - php: 5.5
 
+before_script: composer install --dev --prefer-source

vendor/doctrine/orm/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "doctrine/orm",
-    "type": "library","version":"2.3.2",
+    "type": "library",
     "description": "Object-Relational-Mapper for PHP",
     "keywords": ["orm", "database"],
     "homepage": "http://www.doctrine-project.org",

vendor/doctrine/orm/lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php

@@ -0,0 +1,66 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Id;
+
+use Doctrine\ORM\EntityManager;
+
+/**
+ * Id generator that obtains IDs from special "identity" columns. These are columns
+ * that automatically get a database-generated, auto-incremented identifier on INSERT.
+ * This generator obtains the last insert id after such an insert.
+ */
+class BigIntegerIdentityGenerator extends AbstractIdGenerator
+{
+    /**
+     * The name of the sequence to pass to lastInsertId(), if any.
+     *
+     * @var string
+     */
+    private $sequenceName;
+
+    /**
+     * Constructor.
+     *
+     * @param string|null $seqName The name of the sequence to pass to lastInsertId()
+     *                             to obtain the last generated identifier within the current
+     *                             database session/connection, if any.
+     */
+    public function __construct($sequenceName = null)
+    {
+        $this->sequenceName = $sequenceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function generate(EntityManager $em, $entity)
+    {
+        return (string)$em->getConnection()->lastInsertId($this->sequenceName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isPostInsertGenerator()
+    {
+        return true;
+    }
+}
+

vendor/doctrine/orm/lib/Doctrine/ORM/Id/IdentityGenerator.php

@@ -28,17 +28,21 @@ use Doctrine\ORM\EntityManager;
  */
 class IdentityGenerator extends AbstractIdGenerator
 {
-    /** @var string The name of the sequence to pass to lastInsertId(), if any. */
-    private $_seqName;
+    /**
+     * The name of the sequence to pass to lastInsertId(), if any.
+     *
+     * @var string
+     */
+    private $sequenceName;
 
     /**
      * @param string $seqName The name of the sequence to pass to lastInsertId()
      *                        to obtain the last generated identifier within the current
      *                        database session/connection, if any.
      */
-    public function __construct($seqName = null)
+    public function __construct($sequenceName = null)
     {
-        $this->_seqName = $seqName;
+        $this->sequenceName = $sequenceName;
     }
 
     /**
@@ -46,7 +50,7 @@ class IdentityGenerator extends AbstractIdGenerator
      */
     public function generate(EntityManager $em, $entity)
     {
-        return (int)$em->getConnection()->lastInsertId($this->_seqName);
+        return (int)$em->getConnection()->lastInsertId($this->sequenceName);
     }
 
     /**

vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -19,16 +19,17 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ReflectionException,
-    Doctrine\ORM\ORMException,
-    Doctrine\ORM\EntityManager,
-    Doctrine\DBAL\Platforms,
-    Doctrine\ORM\Events,
-    Doctrine\Common\Persistence\Mapping\ReflectionService,
-    Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface,
-    Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory,
-    Doctrine\ORM\Id\IdentityGenerator,
-    Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use ReflectionException;
+use Doctrine\ORM\ORMException;
+use Doctrine\ORM\EntityManager;
+use Doctrine\DBAL\Platforms;
+use Doctrine\ORM\Events;
+use Doctrine\Common\Persistence\Mapping\ReflectionService;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface;
+use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory;
+use Doctrine\ORM\Id\IdentityGenerator;
+use Doctrine\ORM\Id\BigIntegerIdentityGenerator;
+use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 
 /**
  * The ClassMetadataFactory is used to create ClassMetadata objects that contain all the
@@ -418,9 +419,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
                 // <table>_<column>_seq in PostgreSQL for SERIAL columns.
                 // Not pretty but necessary and the simplest solution that currently works.
                 $sequenceName = null;
+                $fieldName    = $class->identifier ? $class->getSingleIdentifierFieldName() : null;
 
                 if ($this->targetPlatform instanceof Platforms\PostgreSQLPlatform) {
-                    $fieldName      = $class->getSingleIdentifierFieldName();
                     $columnName     = $class->getSingleIdentifierColumnName();
                     $quoted         = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']);
                     $sequenceName   = $class->getTableName() . '_' . $columnName . '_seq';
@@ -435,7 +436,12 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
                     $sequenceName = $this->em->getConfiguration()->getQuoteStrategy()->getSequenceName($definition, $class, $this->targetPlatform);
                 }
 
-                $class->setIdGenerator(new \Doctrine\ORM\Id\IdentityGenerator($sequenceName));
+                $generator = ($fieldName && $class->fieldMappings[$fieldName]['type'] === "bigint")
+                    ? new BigIntegerIdentityGenerator($sequenceName)
+                    : new IdentityGenerator($sequenceName);
+
+                $class->setIdGenerator($generator);
+
                 break;
 
             case ClassMetadata::GENERATOR_TYPE_SEQUENCE:

vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php

@@ -1376,6 +1376,10 @@ class UnitOfWork implements PropertyChangedListener
             return self::STATE_NEW;
         }
 
+        if ($class->containsForeignIdentifier) {
+            $id = $this->flattenIdentifier($class, $id);
+        }
+
         switch (true) {
             case ($class->isIdentifierNatural());
                 // Check for a version field, if available, to avoid a db lookup.
@@ -1689,6 +1693,29 @@ class UnitOfWork implements PropertyChangedListener
     }
 
     /**
+     * convert foreign identifiers into scalar foreign key values to avoid object to string conversion failures.
+     *
+     * @param ClassMetadata $class
+     * @param array $id
+     * @return array
+     */
+    private function flattenIdentifier($class, $id)
+    {
+        $flatId = array();
+
+        foreach ($id as $idField => $idValue) {
+            if (isset($class->associationMappings[$idField])) {
+                $targetClassMetadata = $this->em->getClassMetadata($class->associationMappings[$idField]['targetEntity']);
+                $associatedId        = $this->getEntityIdentifier($idValue);
+
+                $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]];
+            }
+        }
+
+        return $flatId;
+    }
+
+    /**
      * Executes a merge operation on an entity.
      *
      * @param object $entity
@@ -1735,19 +1762,9 @@ class UnitOfWork implements PropertyChangedListener
 
                 $this->persistNew($class, $managedCopy);
             } else {
-                $flatId = $id;
-                if ($class->containsForeignIdentifier) {
-                    // convert foreign identifiers into scalar foreign key
-                    // values to avoid object to string conversion failures.
-                    foreach ($id as $idField => $idValue) {
-                        if (isset($class->associationMappings[$idField])) {
-                            $targetClassMetadata = $this->em->getClassMetadata($class->associationMappings[$idField]['targetEntity']);
-                            $associatedId        = $this->getEntityIdentifier($idValue);
-
-                            $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]];
-                        }
-                    }
-                }
+                $flatId = ($class->containsForeignIdentifier)
+                    ? $this->flattenIdentifier($class, $id)
+                    : $id;
 
                 $managedCopy = $this->tryGetById($flatId, $class->rootEntityName);
 
@@ -2415,17 +2432,23 @@ class UnitOfWork implements PropertyChangedListener
                 if ($entity instanceof NotifyPropertyChanged) {
                     $entity->addPropertyChangedListener($this);
                 }
+
+                // inject ObjectManager into just loaded proxies.
+                if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
+                    $entity->injectObjectManager($this->em, $class);
+                }
+
             } else {
                 $overrideLocalValues = isset($hints[Query::HINT_REFRESH]);
 
                 // If only a specific entity is set to refresh, check that it's the one
                 if(isset($hints[Query::HINT_REFRESH_ENTITY])) {
                     $overrideLocalValues = $hints[Query::HINT_REFRESH_ENTITY] === $entity;
+                }
 
-                    // inject ObjectManager into just loaded proxies.
-                    if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
-                        $entity->injectObjectManager($this->em, $class);
-                    }
+                // inject ObjectManager upon refresh.
+                if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
+                    $entity->injectObjectManager($this->em, $class);
                 }
             }
 

vendor/doctrine/orm/lib/Doctrine/ORM/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.3.2';
+    const VERSION = '2.3.3-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php

@@ -461,4 +461,22 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals($before + 3, count($data));
     }
+
+    /**
+     * @group DDC-2246
+     */
+    public function testGetEntityState()
+    {
+        $this->article1 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id());
+        $this->article2 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article2->id());
+
+        $this->reference = new DDC117Reference($this->article2, $this->article1, "Test-Description");
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($this->reference));
+
+        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference));
+    }
 }

vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+
+use Doctrine\Common\Persistence\ObjectManager;
+
+use Doctrine\Common\Persistence\ObjectManagerAware;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-2231
+ */
+class DDC2231Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2231EntityY'),
+        ));
+    }
+
+    public function testInjectObjectManagerInProxyIfInitializedInUow()
+    {
+        $y1 = new DDC2231EntityY;
+
+        $this->_em->persist($y1);
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $y1ref = $this->_em->getReference(get_class($y1), $y1->id);
+
+        $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $y1ref);
+        $this->assertFalse($y1ref->__isInitialized__);
+
+        $id = $y1ref->doSomething();
+
+        $this->assertTrue($y1ref->__isInitialized__);
+        $this->assertEquals($this->_em, $y1ref->om);
+    }
+}
+
+
+/** @Entity @Table(name="ddc2231_y") */
+class DDC2231EntityY implements ObjectManagerAware
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     */
+    public $id;
+
+    public $om;
+
+    public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata)
+    {
+        $this->om = $objectManager;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function doSomething()
+    {
+    }
+}

vendor/doctrine/orm/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php

@@ -475,24 +475,22 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
 
     /**
      * @group DDC-889
-     * @expectedException Doctrine\ORM\Mapping\MappingException
-     * @expectedExceptionMessage Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.
      */
     public function testInvalidEntityOrMappedSuperClassShouldMentionParentClasses()
     {
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.');
+
         $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class');
     }
 
     /**
      * @group DDC-889
-     * @expectedException Doctrine\ORM\Mapping\MappingException
-     * @expectedExceptionMessage No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key.
      */
     public function testIdentifierRequiredShouldMentionParentClasses()
     {
-
         $factory = $this->createClassMetadataFactory();
-        
+
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key.');
         $factory->getMetadataFor('Doctrine\Tests\Models\DDC889\DDC889Entity');
     }
 
@@ -509,7 +507,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testNamedNativeQuery()
     {
-        
+
         $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
 
         //named native query
@@ -538,7 +536,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertArrayHasKey('mapping-count', $class->sqlResultSetMappings);
         $this->assertArrayHasKey('mapping-find-all', $class->sqlResultSetMappings);
         $this->assertArrayHasKey('mapping-without-fields', $class->sqlResultSetMappings);
-        
+
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
         $this->assertEquals('mapping-find-all', $findAllMapping['name']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $findAllMapping['entities'][0]['entityClass']);
@@ -550,7 +548,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $withoutFieldsMapping['entities'][0]['entityClass']);
         $this->assertEquals(array(), $withoutFieldsMapping['entities'][0]['fields']);
-        
+
         $countMapping = $class->getSqlResultSetMapping('mapping-count');
         $this->assertEquals('mapping-count', $countMapping['name']);
         $this->assertEquals(array('name'=>'count'), $countMapping['columns'][0]);
@@ -638,7 +636,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $adminMetadata  = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Admin');
         $guestMetadata  = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Guest');
 
-        
+
         // assert groups association mappings
         $this->assertArrayHasKey('groups', $guestMetadata->associationMappings);
         $this->assertArrayHasKey('groups', $adminMetadata->associationMappings);
@@ -697,7 +695,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals($guestAddress['isCascadeRefresh'], $adminAddress['isCascadeRefresh']);
         $this->assertEquals($guestAddress['isCascadeMerge'], $adminAddress['isCascadeMerge']);
         $this->assertEquals($guestAddress['isCascadeDetach'], $adminAddress['isCascadeDetach']);
-        
+
         // assert override
         $this->assertEquals('address_id', $guestAddress['joinColumns'][0]['name']);
         $this->assertEquals(array('address_id'=>'id'), $guestAddress['sourceToTargetKeyColumns']);
@@ -1071,7 +1069,7 @@ class DDC807Entity
      * @GeneratedValue(strategy="NONE")
      **/
    public $id;
-   
+
    public static function loadMetadata(ClassMetadataInfo $metadata)
     {
          $metadata->mapField(array(

vendor/gedmo/doctrine-extensions/doc/blameable.md

@@ -71,6 +71,8 @@ then it updates the blame
 you need to identify entity as being Blameable. The metadata is loaded only once then
 cache is activated
 
+Column is a string field:
+
 ``` php
 <?php
 namespace Entity;
@@ -134,6 +136,73 @@ class Article
 }
 ```
 
+Column is an association:
+
+``` php
+<?php
+namespace Entity;
+
+use Gedmo\Mapping\Annotation as Gedmo;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class Article
+{
+    /** @ORM\Id @ORM\GeneratedValue @ORM\Column(type="integer") */
+    private $id;
+
+    /**
+     * @ORM\Column(type="string", length=128)
+     */
+    private $title;
+
+    /**
+     * @var string $createdBy
+     *
+     * @Gedmo\Blameable(on="create")
+     * @ORM\ManyToOne(targetEntity="Path\To\Entity\User")
+     * @ORM\JoinColumn(name="created_by", referencedColumnName="id")
+     */
+    private $createdBy;
+
+    /**
+     * @var string $updatedBy
+     *
+     * @Gedmo\Blameable(on="update")
+     * @ORM\ManyToOne(targetEntity="Path\To\Entity\User")
+     * @ORM\JoinColumn(name="updated_by", referencedColumnName="id")
+     */
+    private $updatedBy;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    public function getCreated()
+    {
+        return $this->created;
+    }
+
+    public function getUpdated()
+    {
+        return $this->updated;
+    }
+}
+```
+
 <a name="document-mapping"></a>
 
 ## Blameable Document example:

vendor/gedmo/doctrine-extensions/doc/reference_integrity.md

@@ -0,0 +1,141 @@
+# Reference Integrity behavior extension for Doctrine 2
+
+**ReferenceIntegrity** behavior will automate the reference integrity for referenced documents.
+It works through annotations and yaml, and supports 'nullify' and 'restrict' which throws an exception.
+
+So let's say you have a Type which is referenced to multiple Articles, when deleting the Type, by default the Article
+would still have a reference to Type, since Mongo doesn't care. When setting the ReferenceIntegrity to 'nullify' it
+would then automatically remove the reference from Article.
+
+Features:
+
+- Automatically remove referenced association
+- ODM only
+- ReferenceOne and ReferenceMany support
+- 'nullify' and 'restrict' support
+- Annotation and Yaml mapping support for extensions
+
+
+**Symfony:**
+
+- **ReferenceIntegrity** is available as [Bundle](http://github.com/stof/StofDoctrineExtensionsBundle)
+for **Symfony2**, together with all other extensions
+
+This article will cover the basic installation and functionality of **ReferenceIntegrity** behavior
+
+Content:
+
+- [Including](#including-extension) the extension
+- Document [example](#document-mapping)
+- [Yaml](#yaml-mapping) mapping example
+- Usage [examples](#advanced-examples)
+
+<a name="including-extension"></a>
+
+## Setup and autoloading
+
+Read the [documentation](http://github.com/l3pp4rd/DoctrineExtensions/blob/master/doc/annotations.md#em-setup)
+or check the [example code](http://github.com/l3pp4rd/DoctrineExtensions/tree/master/example)
+on how to setup and use the extensions in most optimized way.
+
+<a name="document-mapping"></a>
+
+## ReferenceIntegrity Document example:
+
+``` php
+<?php
+namespace Document;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ODM\Document(collection="types")
+ */
+class Type
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Article", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("nullify")
+     * @var Article
+     */
+    protected $article;
+
+    // ...
+}
+```
+
+It is necessary to have the 'mappedBy' option set, to be able to access the referenced documents.
+On removal of Type, on the referenced Article the Type reference will be nullified (removed)
+
+<a name="yaml-mapping"></a>
+
+## Yaml mapping example:
+
+Yaml mapped Article: **/mapping/yaml/Documents.Article.dcm.yml**
+
+```
+---
+Document\Type:
+  type: document
+  collection: types
+  fields:
+      id:
+          id:     true
+      title:
+          type:   string
+      article:
+          reference: true
+          type: one
+          mappedBy: type
+          targetDocument: Document\Article
+          gedmo:
+              referenceIntegrity: nullify   # or restrict
+
+```
+
+It is necessary to have the 'mappedBy' option set, to be able to access the referenced documents.
+
+<a name="advanced-examples"></a>
+
+## Usage examples:
+
+Few operations to see it in action:
+
+``` php
+<?php
+$article = new Article;
+$article->setTitle('My Article');
+
+$type = new Type;
+$type->setTitle('Published');
+
+$article = $em->getRepository('Entity\Article')->findByTitle('My Article');
+$article->setType($type);
+
+$em->persist($article);
+$em->persist($type);
+$em->flush();
+
+$type = $em->getRepository('Entity\Type')->findByTitle('Published');
+$em->remove($type);
+$em->flush();
+
+$article = $em->getRepository('Entity\Article')->findByTitle('My Article');
+$article->getType(); // won't be referenced to Type anymore
+```
+
+When 'ReferenceIntegrity' is set to 'restrict' a `ReferenceIntegrityStrictException` will be thrown, only when there
+is a referenced document.
+
+Easy like that, any suggestions on improvements are very welcome

vendor/gedmo/doctrine-extensions/lib/Gedmo/DoctrineExtensions.php

@@ -29,7 +29,7 @@ final class DoctrineExtensions
 
     /**
      * Flag if annotations were included into registry
-     * allready
+     * already
      *
      * @var boolean
      */

vendor/gedmo/doctrine-extensions/lib/Gedmo/Exception/ReferenceIntegrityStrictException.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Gedmo\Exception;
+
+use Gedmo\Exception;
+
+/**
+ * ReferenceIntegrityStrictException
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.Exception
+ * @subpackage ReferenceIntegrityStrictException
+ * @link http://www.gediminasm.org
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class ReferenceIntegrityStrictException extends RuntimeException
+{}

vendor/gedmo/doctrine-extensions/lib/Gedmo/Mapping/Annotation/ReferenceIntegrity.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Gedmo\Mapping\Annotation;
+
+use Doctrine\Common\Annotations\Annotation;
+
+/**
+ * ReferenceIntegrity annotation for ReferenceIntegrity behavioral extension
+ *
+ * @Annotation
+ * @Target("PROPERTY")
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.Mapping.Annotation
+ * @subpackage ReferenceIntegrity
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+final class ReferenceIntegrity extends Annotation
+{}

vendor/gedmo/doctrine-extensions/lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Annotation.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Gedmo\ReferenceIntegrity\Mapping\Driver;
+
+use Gedmo\Mapping\Driver\AbstractAnnotationDriver;
+use Gedmo\Exception\InvalidMappingException;
+use Gedmo\Mapping\Annotation\ReferenceIntegrityAction;
+use Gedmo\ReferenceIntegrity\Mapping\Validator;
+
+/**
+ * This is an annotation mapping driver for ReferenceIntegrity
+ * behavioral extension. Used for extraction of extended
+ * metadata from Annotations specifically for ReferenceIntegrity
+ * extension.
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.ReferenceIntegrity.Mapping.Driver
+ * @subpackage Annotation
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class Annotation extends AbstractAnnotationDriver
+{
+    /**
+     * Annotation to identify the fields which manages the reference integrity
+     */
+    const REFERENCE_INTEGRITY = 'Gedmo\\Mapping\\Annotation\\ReferenceIntegrity';
+
+    /**
+     * ReferenceIntegrityAction extension annotation
+     */
+    const ACTION = 'Gedmo\\Mapping\\Annotation\\ReferenceIntegrityAction';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function readExtendedMetadata($meta, array &$config)
+    {
+        $validator = new Validator();
+        $reflClass = $this->getMetaReflectionClass($meta);
+
+        foreach ($reflClass->getProperties() as $reflProperty) {
+            if ($referenceIntegrity = $this->reader->getPropertyAnnotation($reflProperty, self::REFERENCE_INTEGRITY)) {
+                $property = $reflProperty->getName();
+                if (!$meta->hasField($property)) {
+                    throw new InvalidMappingException(
+                        sprintf(
+                            "Unable to find reference integrity [%s] as mapped property in entity - %s",
+                            $property,
+                            $meta->name
+                        )
+                    );
+                }
+
+                $fieldMapping = $meta->getFieldMapping($property);
+                if (!isset($fieldMapping['mappedBy'])) {
+                    throw new InvalidMappingException(
+                        sprintf(
+                            "'mappedBy' should be set on '%s' in '%s'",
+                            $property,
+                            $meta->name
+                        )
+                    );
+                }
+
+                if (!in_array($referenceIntegrity->value, $validator->getIntegrityActions())) {
+                    throw new InvalidMappingException(
+                        sprintf(
+                            "Field - [%s] does not have a valid integrity option, [%s] in class - %s",
+                            $property,
+                            implode($validator->getIntegrityActions(), ', '),
+                            $meta->name
+                        )
+                    );
+                }
+
+                $config['referenceIntegrity'][$property] = $referenceIntegrity->value;
+            }
+        }
+    }
+}

vendor/gedmo/doctrine-extensions/lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Yaml.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Gedmo\ReferenceIntegrity\Mapping\Driver;
+
+use Gedmo\Exception\InvalidMappingException;
+use Gedmo\Mapping\Driver\File;
+use Gedmo\Mapping\Driver;
+use Gedmo\ReferenceIntegrity\Mapping\Validator;
+
+/**
+ * This is a yaml mapping driver for ReferenceIntegrity
+ * extension. Used for extraction of extended
+ * metadata from yaml specifically for ReferenceIntegrity
+ * extension.
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.ReferenceIntegrity.Mapping.Driver
+ * @subpackage Yaml
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class Yaml extends File implements Driver
+{
+    /**
+     * File extension
+     * @var string
+     */
+    protected $_extension = '.dcm.yml';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function readExtendedMetadata($meta, array &$config)
+    {
+        $mapping = $this->_getMapping($meta->name);
+        $validator = new Validator();
+
+        if (isset($mapping['fields'])) {
+            foreach ($mapping['fields'] as $property => $fieldMapping) {
+                if (isset($fieldMapping['gedmo']['referenceIntegrity'])) {
+                    if (!$meta->hasField($property)) {
+                        throw new InvalidMappingException(
+                            sprintf(
+                                "Unable to find reference integrity [%s] as mapped property in entity - %s",
+                                $property,
+                                $meta->name
+                            )
+                        );
+                    }
+
+                    if (empty($mapping['fields'][$property]['mappedBy'])) {
+                        throw new InvalidMappingException(
+                            sprintf(
+                                "'mappedBy' should be set on '%s' in '%s'",
+                                $property,
+                                $meta->name
+                            )
+                        );
+                    }
+
+                    if (!in_array($fieldMapping['gedmo']['referenceIntegrity'], $validator->getIntegrityActions())) {
+                        throw new InvalidMappingException(
+                            sprintf(
+                                "Field - [%s] does not have a valid integrity option, [%s] in class - %s",
+                                $property,
+                                implode($validator->getIntegrityActions(), ', '),
+                                $meta->name
+                            )
+                        );
+                    }
+
+                    $config['referenceIntegrities'][$property][$mapping['fields'][$property]['mappedBy']] =
+                        $fieldMapping['gedmo']['referenceIntegrity'];
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function _loadMappingFile($file)
+    {
+        return \Symfony\Component\Yaml\Yaml::parse($file);
+    }
+}

vendor/gedmo/doctrine-extensions/lib/Gedmo/ReferenceIntegrity/Mapping/Validator.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Gedmo\ReferenceIntegrity\Mapping;
+
+/**
+ * This class is used to validate mapping information
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.ReferenceIntegrity.Mapping
+ * @subpackage Validator
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+class Validator
+{
+    const NULLIFY = 'nullify';
+    const RESTRICT = 'restrict';
+
+    /**
+     * List of actions which are valid as integrity check
+     *
+     * @var array
+     */
+    private $integrityActions = array(
+        self::RESTRICT,
+        self::NULLIFY
+    );
+
+    /**
+     * Returns a list of available integrity actions
+     *
+     * @return array
+     */
+    public function getIntegrityActions()
+    {
+        return $this->integrityActions;
+    }
+}

vendor/gedmo/doctrine-extensions/lib/Gedmo/ReferenceIntegrity/ReferenceIntegrity.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Gedmo\ReferenceIntegrity;
+
+/**
+ * This interface is not necessary but can be implemented for
+ * Entities which in some cases needs to be identified te have
+ * ReferenceIntegrity checks
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.ReferenceIntegrity
+ * @subpackage ReferenceIntegrity
+ * @link http://www.gediminasm.org
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+interface ReferenceIntegrity
+{
+    /**
+     * ReferenceIntegrity expects certain settings to be required
+     * in combination with an association
+     */
+
+    /**
+     * example
+     * @ODM\ReferenceOne(targetDocument="Article", nullable="true", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("nullify")
+     * @var Article
+     */
+
+    /**
+     * example
+     * @ODM\ReferenceOne(targetDocument="Article", nullable="true", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("restrict")
+     * @var Article
+     */
+
+    /**
+     * example
+     * @ODM\ReferenceMany(targetDocument="Article", nullable="true", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("nullify")
+     * @var Doctrine\Common\Collections\ArrayCollection
+     */
+
+    /**
+     * example
+     * @ODM\ReferenceMany(targetDocument="Article", nullable="true", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("restrict")
+     * @var Doctrine\Common\Collections\ArrayCollection
+     */
+}

vendor/gedmo/doctrine-extensions/lib/Gedmo/ReferenceIntegrity/ReferenceIntegrityListener.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace Gedmo\ReferenceIntegrity;
+
+use Doctrine\Common\EventArgs;
+use Gedmo\Exception\InvalidMappingException;
+use Gedmo\Exception\ReferenceIntegrityStrictException;
+use Gedmo\Mapping\MappedEventSubscriber;
+use Gedmo\ReferenceIntegrity\Mapping\Validator;
+
+/**
+ * The ReferenceIntegrity listener handles the reference integrity on related entities
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.ReferenceIntegrity
+ * @subpackage ReferenceIntegrityListener
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class ReferenceIntegrityListener extends MappedEventSubscriber
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubscribedEvents()
+    {
+        return array(
+            'loadClassMetadata',
+            'preRemove'
+        );
+    }
+
+    /**
+     * Maps additional metadata for the Entity
+     *
+     * @param  EventArgs $eventArgs
+     * @return void
+     */
+    public function loadClassMetadata(EventArgs $eventArgs)
+    {
+        $ea = $this->getEventAdapter($eventArgs);
+        $this->loadMetadataForObjectClass($ea->getObjectManager(), $eventArgs->getClassMetadata());
+    }
+
+    /**
+     * Looks for referenced objects being removed
+     * to nullify the relation or throw an exception
+     *
+     * @param  EventArgs $args
+     * @return void
+     */
+    public function preRemove(EventArgs $args)
+    {
+        $ea = $this->getEventAdapter($args);
+        $om = $ea->getObjectManager();
+        $object = $ea->getObject();
+        $class = get_class($object);
+        $meta = $om->getClassMetadata($class);
+
+        if ($config = $this->getConfiguration($om, $class)) {
+            foreach ($config['referenceIntegrity'] as $property => $action) {
+                $reflProp = $meta->getReflectionProperty($property);
+                $refDoc = $reflProp->getValue($object);
+                $fieldMapping = $meta->getFieldMapping($property);
+
+                switch ($action) {
+                    case Validator::NULLIFY:
+                        if (!isset($fieldMapping['mappedBy'])) {
+                            throw new InvalidMappingException(
+                                sprintf(
+                                    "Reference '%s' on '%s' should have 'mappedBy' option defined",
+                                    $property,
+                                    $meta->name
+                                )
+                            );
+                        }
+
+                        $subMeta = $om->getClassMetadata($fieldMapping['targetDocument']);
+
+                        if (!$subMeta->hasField($fieldMapping['mappedBy'])) {
+                            throw new InvalidMappingException(
+                                sprintf(
+                                    "Unable to find reference integrity [%s] as mapped property in entity - %s",
+                                    $fieldMapping['mappedBy'],
+                                    $fieldMapping['targetDocument']
+                                )
+                            );
+                        }
+
+                        $refReflProp = $subMeta->getReflectionProperty($fieldMapping['mappedBy']);
+
+                        if ($meta->isCollectionValuedReference($property)) {
+                            foreach ($refDoc as $object) {
+                                $refReflProp->setValue($object, null);
+                                $om->persist($object);
+                            }
+                        } else {
+                            $refReflProp->setValue($refDoc, null);
+                            $om->persist($refDoc);
+                        }
+
+                        break;
+                    case Validator::RESTRICT:
+                        if ($meta->isCollectionValuedReference($property) && $refDoc->count() > 0) {
+                            throw new ReferenceIntegrityStrictException(
+                                sprintf(
+                                    "The reference integrity for the '%s' collection is restricted",
+                                    $fieldMapping['targetDocument']
+                                )
+                            );
+                        }
+                        if ($meta->isSingleValuedReference($property) && !is_null($refDoc)) {
+                            throw new ReferenceIntegrityStrictException(
+                                sprintf(
+                                    "The reference integrity for the '%s' document is restricted",
+                                    $fieldMapping['targetDocument']
+                                )
+                            );
+                        }
+
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getNamespace()
+    {
+        return __NAMESPACE__;
+    }
+}

vendor/gedmo/doctrine-extensions/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php

@@ -22,10 +22,10 @@ trait SoftDeleteableDocument
     /**
      * Sets deletedAt.
      *
-     * @param  Datetime $deletedAt
+     * @param \Datetime|null $deletedAt
      * @return $this
      */
-    public function setDeletedAt(\DateTime $deletedAt)
+    public function setDeletedAt(\DateTime $deletedAt = null)
     {
         $this->deletedAt = $deletedAt;
 

vendor/gedmo/doctrine-extensions/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php

@@ -22,10 +22,10 @@ trait SoftDeleteableEntity
     /**
      * Sets deletedAt.
      *
-     * @param  Datetime $deletedAt
+     * @param \Datetime|null $deletedAt
      * @return $this
      */
-    public function setDeletedAt(\DateTime $deletedAt)
+    public function setDeletedAt(\DateTime $deletedAt = null)
     {
         $this->deletedAt = $deletedAt;
 

vendor/gedmo/doctrine-extensions/lib/Gedmo/Sortable/SortableListener.php

@@ -321,7 +321,7 @@ class SortableListener extends MappedEventSubscriber
                 // now walk through the unit of work in memory objects and sync those
                 foreach ($em->getUnitOfWork()->getIdentityMap() as $className => $objects) {
                     // for inheritance mapped classes, only root is always in the identity map
-                    if ($className !== $meta->rootEntityName) {
+                    if ($className !== $meta->rootEntityName || !$this->getConfiguration($em, $className)) {
                         continue;
                     }
                     foreach ($objects as $object) {

vendor/gedmo/doctrine-extensions/lib/Gedmo/Timestampable/Mapping/Driver/Annotation.php

@@ -13,7 +13,7 @@ use Gedmo\Mapping\Driver\AbstractAnnotationDriver,
  * extension.
  *
  * @author Gediminas Morkevicius <gediminas.morkevicius@gmail.com>
- * @package Gedmo.Translatable.Mapping.Driver
+ * @package Gedmo.Timestampable.Mapping.Driver
  * @subpackage Annotation
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)

vendor/gedmo/doctrine-extensions/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php

@@ -17,13 +17,13 @@ trait TimestampableEntity
      * @Gedmo\Timestampable(on="create")
      * @ORM\Column(type="datetime")
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @Gedmo\Timestampable(on="update")
      * @ORM\Column(type="datetime")
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * Sets createdAt.

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/ManyNullify/Article.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\ManyNullify;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+/**
+ * @ODM\Document(collection="articles")
+ */
+class Article
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Type", simple="true", inversedBy="articles")
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param Type $type
+     */
+    public function setType(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @return Type
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/ManyNullify/Type.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\ManyNullify;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ODM\Document(collection="types")
+ */
+class Type
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\String
+     */
+    private $identifier;
+
+    /**
+     * @ODM\ReferenceMany(targetDocument="Article", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("nullify")
+     * @var ArrayCollection
+     */
+    protected $articles = array();
+
+    public function __construct()
+    {
+        $this->articles = new ArrayCollection();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $identifier
+     */
+    public function setIdentifier($identifier)
+    {
+        $this->identifier = $identifier;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * Add articles
+     *
+     * @param Article $article
+     */
+    public function addArticle(Article $article)
+    {
+        $this->articles[] = $article;
+    }
+
+    /**
+     * Get posts
+     *
+     * @return ArrayCollection $articles
+     */
+    public function getArticles()
+    {
+        return $this->articles;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/ManyRestrict/Article.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\ManyRestrict;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+/**
+ * @ODM\Document(collection="articles")
+ */
+class Article
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Type", simple="true", inversedBy="articles")
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param Type $type
+     */
+    public function setType(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @return Type
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/ManyRestrict/Type.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\ManyRestrict;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ODM\Document(collection="types")
+ */
+class Type
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\String
+     */
+    private $identifier;
+
+    /**
+     * @ODM\ReferenceMany(targetDocument="Article", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("restrict")
+     * @var ArrayCollection
+     */
+    protected $articles = array();
+
+    public function __construct()
+    {
+        $this->articles = new ArrayCollection();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $identifier
+     */
+    public function setIdentifier($identifier)
+    {
+        $this->identifier = $identifier;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * Add articles
+     *
+     * @param Article $article
+     */
+    public function addArticle(Article $article)
+    {
+        $this->articles[] = $article;
+    }
+
+    /**
+     * Get posts
+     *
+     * @return ArrayCollection $articles
+     */
+    public function getArticles()
+    {
+        return $this->articles;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/OneNullify/Article.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\OneNullify;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+/**
+ * @ODM\Document(collection="articles")
+ */
+class Article
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Type", simple="true", inversedBy="articles")
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param Type $type
+     */
+    public function setType(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @return Type
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/OneNullify/Type.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\OneNullify;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ODM\Document(collection="types")
+ */
+class Type
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\String
+     */
+    private $identifier;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Article", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("nullify")
+     * @var Article
+     */
+    protected $article;
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $identifier
+     */
+    public function setIdentifier($identifier)
+    {
+        $this->identifier = $identifier;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * @param Article $article
+     */
+    public function setArticle(Article $article)
+    {
+        $this->article = $article;
+    }
+
+    /**
+     * @return Article $article
+     */
+    public function getArticle()
+    {
+        return $this->article;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/OneRestrict/Article.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\OneRestrict;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+/**
+ * @ODM\Document(collection="articles")
+ */
+class Article
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Type", simple="true", inversedBy="articles")
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param Type $type
+     */
+    public function setType(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @return Type
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/Fixture/Document/OneRestrict/Type.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace ReferenceIntegrity\Fixture\Document\OneRestrict;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ODM\Document(collection="types")
+ */
+class Type
+{
+    /**
+     * @ODM\Id
+     */
+    private $id;
+
+    /**
+     * @ODM\String
+     */
+    private $title;
+
+    /**
+     * @ODM\String
+     */
+    private $identifier;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Article", mappedBy="type")
+     * @Gedmo\ReferenceIntegrity("restrict")
+     * @var Article
+     */
+    protected $article;
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $identifier
+     */
+    public function setIdentifier($identifier)
+    {
+        $this->identifier = $identifier;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * @param Article $article
+     */
+    public function setArticle(Article $article)
+    {
+        $this->article = $article;
+    }
+
+    /**
+     * @return Article $articles
+     */
+    public function getArticle()
+    {
+        return $this->article;
+    }
+}

vendor/gedmo/doctrine-extensions/tests/Gedmo/ReferenceIntegrity/ReferenceIntegrityDocumentTest.php

@@ -0,0 +1,195 @@
+<?php
+
+namespace Gedmo\ReferenceIntegrity;
+
+use Doctrine\Common\EventManager;
+use Gedmo\ReferenceIntegrity\ReferenceIntegrityListener;
+use Tool\BaseTestCaseMongoODM;
+
+/**
+ * These are tests for the ReferenceIntegrity extension
+ *
+ * @author Evert Harmeling <evert.harmeling@freshheads.com>
+ * @package Gedmo.ReferenceIntegrity
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class ReferenceIntegrityDocumentTest extends BaseTestCaseMongoODM
+{
+    const TYPE_ONE_NULLIFY_CLASS = 'ReferenceIntegrity\Fixture\Document\OneNullify\Type';
+    const ARTICLE_ONE_NULLIFY_CLASS = 'ReferenceIntegrity\Fixture\Document\OneNullify\Article';
+
+    const TYPE_MANY_NULLIFY_CLASS = 'ReferenceIntegrity\Fixture\Document\ManyNullify\Type';
+    const ARTICLE_MANY_NULLIFY_CLASS = 'ReferenceIntegrity\Fixture\Document\ManyNullify\Article';
+
+    const TYPE_ONE_RESTRICT_CLASS = 'ReferenceIntegrity\Fixture\Document\OneRestrict\Type';
+    const ARTICLE_ONE_RESTRICT_CLASS = 'ReferenceIntegrity\Fixture\Document\OneRestrict\Article';
+
+    const TYPE_MANY_RESTRICT_CLASS = 'ReferenceIntegrity\Fixture\Document\ManyRestrict\Type';
+    const ARTICLE_MANY_RESTRICT_CLASS = 'ReferenceIntegrity\Fixture\Document\ManyRestrict\Article';
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $evm = new EventManager();
+        $evm->addEventSubscriber(new ReferenceIntegrityListener());
+
+        $this->dm = $this->getMockDocumentManager($evm, $this->getMockAnnotatedConfig());
+
+        $this->populateOneNullify();
+        $this->populateManyNullify();
+
+        $this->populateOneRestrict();
+        $this->populateManyRestrict();
+    }
+
+    public function testOneNullify()
+    {
+        $type = $this->dm->getRepository(self::TYPE_ONE_NULLIFY_CLASS)
+            ->findOneByTitle('One Nullify Type');
+
+        $this->assertFalse(is_null($type));
+        $this->assertTrue(is_object($type));
+
+        $this->dm->remove($type);
+        $this->dm->flush();
+
+        $type = $this->dm->getRepository(self::TYPE_ONE_NULLIFY_CLASS)
+            ->findOneByTitle('One Nullify Type');
+        $this->assertNull($type);
+
+        $article = $this->dm->getRepository(self::ARTICLE_ONE_NULLIFY_CLASS)
+            ->findOneByTitle('One Nullify Article');
+
+        $this->assertNull($article->getType());
+
+        $this->dm->clear();
+    }
+
+    public function testManyNullify()
+    {
+        $type = $this->dm->getRepository(self::TYPE_MANY_NULLIFY_CLASS)
+            ->findOneByTitle('Many Nullify Type');
+
+        $this->assertFalse(is_null($type));
+        $this->assertTrue(is_object($type));
+
+        $this->dm->remove($type);
+        $this->dm->flush();
+
+        $type = $this->dm->getRepository(self::TYPE_MANY_NULLIFY_CLASS)
+            ->findOneByTitle('Many Nullify Type');
+        $this->assertNull($type);
+
+        $article = $this->dm->getRepository(self::ARTICLE_MANY_NULLIFY_CLASS)
+            ->findOneByTitle('Many Nullify Article');
+
+        $this->assertNull($article->getType());
+
+        $this->dm->clear();
+    }
+
+    /**
+     * @test
+     * @expectedException Gedmo\Exception\ReferenceIntegrityStrictException
+     */
+    public function testOneRestrict()
+    {
+        $type = $this->dm->getRepository(self::TYPE_ONE_RESTRICT_CLASS)
+            ->findOneByTitle('One Restrict Type');
+
+        $this->assertFalse(is_null($type));
+        $this->assertTrue(is_object($type));
+
+        $this->dm->remove($type);
+        $this->dm->flush();
+    }
+
+    /**
+     * @test
+     * @expectedException Gedmo\Exception\ReferenceIntegrityStrictException
+     */
+    public function testManyRestrict()
+    {
+        $type = $this->dm->getRepository(self::TYPE_MANY_RESTRICT_CLASS)
+            ->findOneByTitle('Many Restrict Type');
+
+        $this->assertFalse(is_null($type));
+        $this->assertTrue(is_object($type));
+
+        $this->dm->remove($type);
+        $this->dm->flush();
+    }
+
+    private function populateOneNullify()
+    {
+        $typeClass = self::TYPE_ONE_NULLIFY_CLASS;
+        $type = new $typeClass();
+        $type->setTitle('One Nullify Type');
+
+        $articleClass = self::ARTICLE_ONE_NULLIFY_CLASS;
+        $article = new $articleClass();
+        $article->setTitle('One Nullify Article');
+        $article->setType($type);
+
+        $this->dm->persist($article);
+        $this->dm->persist($type);
+
+        $this->dm->flush();
+        $this->dm->clear();
+    }
+
+    private function populateManyNullify()
+    {
+        $typeClass = self::TYPE_MANY_NULLIFY_CLASS;
+        $type = new $typeClass();
+        $type->setTitle('Many Nullify Type');
+
+        $articleClass = self::ARTICLE_MANY_NULLIFY_CLASS;
+        $article = new $articleClass();
+        $article->setTitle('Many Nullify Article');
+        $article->setType($type);
+
+        $this->dm->persist($article);
+        $this->dm->persist($type);
+
+        $this->dm->flush();
+        $this->dm->clear();
+    }
+
+    private function populateOneRestrict()
+    {
+        $typeClass = self::TYPE_ONE_RESTRICT_CLASS;
+        $type = new $typeClass();
+        $type->setTitle('One Restrict Type');
+
+        $articleClass = self::ARTICLE_ONE_RESTRICT_CLASS;
+        $article = new $articleClass();
+        $article->setTitle('One Restrict Article');
+        $article->setType($type);
+
+        $this->dm->persist($article);
+        $this->dm->persist($type);
+
+        $this->dm->flush();
+        $this->dm->clear();
+    }
+
+    private function populateManyRestrict()
+    {
+        $typeClass = self::TYPE_MANY_RESTRICT_CLASS;
+        $type = new $typeClass();
+        $type->setTitle('Many Restrict Type');
+
+        $articleClass = self::ARTICLE_MANY_RESTRICT_CLASS;
+        $article = new $articleClass();
+        $article->setTitle('Many Restrict Article');
+        $article->setType($type);
+
+        $this->dm->persist($article);
+        $this->dm->persist($type);
+
+        $this->dm->flush();
+        $this->dm->clear();
+    }
+}

vendor/gedmo/doctrine-extensions/tests/bootstrap.php

@@ -49,6 +49,7 @@ $loader->add('Loggable\\Fixture', __DIR__ . '/Gedmo');
 $loader->add('SoftDeleteable\\Fixture', __DIR__ . '/Gedmo');
 $loader->add('Uploadable\\Fixture', __DIR__ . '/Gedmo');
 $loader->add('Wrapper\\Fixture', __DIR__ . '/Gedmo');
+$loader->add('ReferenceIntegrity\\Fixture', __DIR__ . '/Gedmo');
 // stubs
 $loader->add('Gedmo\\Uploadable\\Stub', __DIR__);
 

vendor/gedmo/doctrine-extensions/tests/phpunit.xml.dist

@@ -50,6 +50,9 @@
         <testsuite name="Uploadable Extension">
             <directory suffix="Test.php">./Gedmo/Uploadable/</directory>
         </testsuite>
+        <testsuite name="ReferenceIntegrity Extension">
+            <directory suffix="Test.php">./Gedmo/ReferenceIntegrity/</directory>
+        </testsuite>
     </testsuites>
 
     <filter>

vendor/jdorn/sql-formatter/README.md

@@ -1,8 +1,9 @@
 SqlFormatter
 =============
 
-A lightweight php class for formatting sql statements.  Handles automatic
-indentation and syntax highlighting.
+A lightweight php class for formatting sql statements.
+
+It can automatically indent and add line breaks in addition to syntax highlighting.
 
 History
 ============
@@ -29,25 +30,77 @@ Sample usage:
 <?php
 require_once('SqlFormatter.php');
 
-echo SqlFormatter::format("SELECT * FROM MyTable LIMIT 10");
+$query = "SELECT count(*),`Column1`,`Testing`, `Testing Three` FROM `Table1`
+    WHERE Column1 = 'testing' AND ( (`Column2` = `Column3` OR Column4 >= NOW()) )
+    GROUP BY Column1 ORDER BY Column3 DESC LIMIT 5,10";
+
+echo SqlFormatter::format($query);
+```
+
+Output:
+
+![](http://jdorn.github.com/sql-formatter/format-highlight.png)
+
+Formatting Only
+-------------------------
+If you don't want syntax highlighting and only want the indentations and 
+line breaks, pass in false as the second parameter.
+
+This is useful for outputting to error logs or other non-html formats.
+
+```php
+<?php
+echo SqlFormatter::format($query, false);
 ```
 
-Sample output:
+Output:
 
-![](http://github.com/jdorn/sql-formatter/raw/master/examples/SqlFormatterExample.png)
+![](http://jdorn.github.com/sql-formatter/format.png)
 
 Syntax Highlighting Only
 -------------------------
 
-There is also a static method 'highlight' that only does syntax highlighting 
-and preserves all original whitespace.
+There is a separate method 'highlight' that preserves all original whitespace
+and just adds syntax highlighting.
 
 This is useful for sql that is already well formatted and just needs to be a little
 easier to read.
 
 ```php
 <?php
-echo SqlFormatter::highlight("SELECT * FROM MyTable LIMIT 10");
+echo SqlFormatter::highlight($query);
+```
+
+Output:
+
+![](http://jdorn.github.com/sql-formatter/highlight.png)
+
+Remove Comments
+------------------------
+
+There is a removeComments method that, you guessed it, removes all comments from a query.
+
+```
+-- This is a comment
+    SELECT
+    /* This is another comment
+    On more than one line */
+    Id #This is one final comment
+    as temp, DateCreated as Created FROM MyTable;
+```
+
+```php
+<?php
+echo SqlFormatter::removeComments($query);
+```
+
+Output:
+```
+
+    SELECT
+    
+    Id 
+    as temp, DateCreated as Created FROM MyTable;
 ```
 
 Split SQL String into Queries
@@ -67,14 +120,24 @@ SELECT * FROM MyTable;
 ```
 
 ```php
+<?php
 $queries = SqlFormatter::splitQuery($sql);
 ```
-$queries is now an array of the 4 queries without trailing semicolons.
 
-Why not just use explode(';',$sql) or regular expressions?  The following example sql and others like it
-are impossible to split correctly using regular expressions.
+Result:
 
-```sql
+1.    `DROP TABLE IF EXISTS MyTable`;
+2.    `CREATE TABLE MyTable ( id int )`;
+3.    `INSERT INTO MyTable (id) VALUES (1),(2),(3),(4)`;
+4.    `SELECT * FROM MyTable`;
+
+### Why Not Regular Expressions?
+
+Why not just use `explode(';', $sql)` or a regular expression?
+
+The following example sql and others like it are _impossible_ to split correctly using regular expressions, no matter how complex.  
+
+```
 SELECT ";"; SELECT ";\"; a;";
 SELECT ";
     abc";
@@ -82,6 +145,15 @@ SELECT a,b #comment;
 FROM test;
 ```
 
-The splitQuery method will still fail in the following cases:
+SqlFormatter breaks the string into tokens instead of using regular expressions and will correctly produce:
+
+1.    `SELECT ";"`;
+2.    `SELECT ";\"; a;"`;
+3.    `SELECT "; abc"`;
+4.    `SELECT a,b #comment;
+FROM test`;
+
+Please note, the splitQuery method will still fail in the following cases:
 *    The DELIMITER command can be used to change the delimiter from the default ';' to something else.  
-*    The CREATE PROCEDURE command
+*    The CREATE PROCEDURE command has a ';' in the middle of it
+*    The USE command is not terminated with a ';'

vendor/jdorn/sql-formatter/examples/examples.php

@@ -74,6 +74,20 @@ $split_statements = array(
         abc\";
     SELECT a,b #comment;
     FROM test;",
+    
+    "
+    -- Drop the table first if it exists
+    DROP TABLE IF EXISTS MyTable;
+
+    -- Create the table
+    CREATE TABLE MyTable ( id int );
+
+    -- Insert values
+    INSERT INTO MyTable (id)
+        VALUES
+        (1),(2),(3),(4);
+
+    -- Done",
 );
 
 // Example statements for removing comments

vendor/jdorn/sql-formatter/tests/performance.php

@@ -1,42 +1,42 @@
 <?php
 require '../lib/SqlFormatter.php';
+
 //this is the default value
 //set to '0' to disable caching
 //a value between 10 and 20 seems to give the best result
 SqlFormatter::$max_cachekey_size = 15;
 
-$contents = file('sql.sql');
+//the sample query file is filled with install scripts for PrestaShop
+//and some sample catalog data from Magento
+$contents = file_get_contents('sql.sql');
+
+//queries are separated by 2 new lines
+$queries = explode("\n\n",$contents);
 
 //track time and memory usage
 $start = microtime(true);
 $ustart = memory_get_usage(true);
 
 //track number of queries and size of queries
-$queries = 0;
-$bytes = 0;
-
-//format each query 3 times
-for ($i =0; $i<3; $i++) {
-    foreach ($contents as $query) {
-		//this tries to mix up the queries so we aren't just running the same thing a bunch of times
-        $query = str_replace('tablename', rand(1, 10000), $query);
-
-		//do formatting and highlighting
-        SqlFormatter::format($query);
-        
-        $queries++;
-        $bytes += strlen($query);
-    }
+$num = 0;
+$chars = 0;
+
+foreach ($queries as $query) {
+	//do formatting and highlighting
+	SqlFormatter::format($query);
+	
+	$num++;
+	$chars += strlen($query);
 }
 
 $uend = memory_get_usage(true);
 $end = microtime(true);
 
-echo "<p>Formatted $queries queries.</p>";
+echo "<p>Formatted ".$num." queries using a max_cachekey_size of ".SqlFormatter::$max_cachekey_size."</p>";
 
-echo "<p>Average query length of ".number_format($bytes/$queries,5)." characters</p>";
+echo "<p>Average query length of ".number_format($chars/$num,5)." characters</p>";
 
-echo "<p>Took ".number_format($end-$start,5)." seconds total, ".number_format(($end-$start)/$queries,5)." seconds per query, ".number_format(1000*($end-$start)/$bytes,5)." seconds per 1000 characters</p>";
+echo "<p>Took ".number_format($end-$start,5)." seconds total, ".number_format(($end-$start)/$num,5)." seconds per query, ".number_format(1000*($end-$start)/$chars,5)." seconds per 1000 characters</p>";
 
 echo "<p>Used ".number_format($uend-$ustart)." bytes of memory</p>";
 

vendor/jdorn/sql-formatter/tests/regression.php

@@ -0,0 +1,23 @@
+<?php
+require '../lib/SqlFormatter.php';
+
+//the sample query file is filled with install scripts for PrestaShop
+//and some sample catalog data from Magento
+$contents = file_get_contents('sql.sql');
+
+//queries are separated by 2 new lines
+$queries = explode("\n\n",$contents);
+
+$output = "<ol>\n";
+
+foreach ($queries as $query) {
+	//do formatting and highlighting
+	$output .= "<li>".SqlFormatter::format($query)."</li>\n\n";
+}
+
+$output .= "</ol>";
+
+$expected = file_get_contents('expected.html');
+
+if($expected === $output) echo "Got expected output.  No changes found.";
+else echo $output;

vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/JMSSecurityExtraBundle.php

@@ -35,7 +35,7 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
  */
 class JMSSecurityExtraBundle extends Bundle
 {
-    const VERSION = '1.2.0';
+    const VERSION = '1.2.1-DEV';
 
     public function build(ContainerBuilder $container)
     {

vendor/knplabs/knp-menu

@@ -0,0 +1 @@
+Subproject commit 730bc37232f5f813822acf80edfbd89381ea5971

vendor/knplabs/knp-menu-bundle/Knp/Bundle/MenuBundle

@@ -0,0 +1 @@
+Subproject commit bfaa9f1a74ee590c5e6460a3139b268fce1f1885

vendor/pagerfanta/pagerfanta

@@ -0,0 +1 @@
+Subproject commit 2608116b1d0908c07f6590bc10addab37fd4a49f

vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Configurator/Step/DoctrineStep.php

@@ -121,7 +121,7 @@ class DoctrineStep implements StepInterface
     /**
      * @return array
      */
-    static public function getDriverKeys()
+    public static function getDriverKeys()
     {
         return array_keys(static::getDrivers());
     }
@@ -129,7 +129,7 @@ class DoctrineStep implements StepInterface
     /**
      * @return array
      */
-    static public function getDrivers()
+    public static function getDrivers()
     {
         return array(
             'pdo_mysql'  => 'MySQL (PDO)',

vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Configurator/Step/SecretStep.php

@@ -28,7 +28,7 @@ class SecretStep implements StepInterface
 
     public function __construct(array $parameters)
     {
-        if (array_key_exists('secret', $parameters)){
+        if (array_key_exists('secret', $parameters)) {
             $this->secret = $parameters['secret'];
 
             if ('ThisTokenIsNotSoSecretChangeIt' == $this->secret) {

vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Configurator/Step/StepInterface.php

@@ -25,41 +25,41 @@ interface StepInterface
      *
      * @param array $parameters
      */
-    function __construct(array $parameters);
+    public function __construct(array $parameters);
 
     /**
      * Returns the form used for configuration.
      *
      * @return FormTypeInterface
      */
-    function getFormType();
+    public function getFormType();
 
     /**
      * Checks for requirements.
      *
      * @return array
      */
-    function checkRequirements();
+    public function checkRequirements();
 
     /**
      * Checks for optional setting it could be nice to have.
      *
      * @return array
      */
-    function checkOptionalSettings();
+    public function checkOptionalSettings();
 
     /**
      * Returns the template to be renderer for this step.
      *
      * @return string
      */
-    function getTemplate();
+    public function getTemplate();
 
     /**
      * Updates form data parameters.
      *
-     * @param array $parameters
+     * @param  array $parameters
      * @return array
      */
-    function update(StepInterface $data);
+    public function update(StepInterface $data);
 }

vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/config/webconfigurator.xml

@@ -14,4 +14,3 @@
         </service>
     </services>
 </container>
-

vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php

@@ -41,11 +41,11 @@ class Requirement
     /**
      * Constructor that initializes the requirement.
      *
-     * @param Boolean      $fulfilled     Whether the requirement is fulfilled
-     * @param string       $testMessage   The message for testing the requirement
-     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
-     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
-     * @param Boolean      $optional      Whether this is only an optional recommendation not a mandatory requirement
+     * @param Boolean     $fulfilled   Whether the requirement is fulfilled
+     * @param string      $testMessage The message for testing the requirement
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $optional    Whether this is only an optional recommendation not a mandatory requirement
      */
     public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
     {
@@ -117,16 +117,16 @@ class PhpIniRequirement extends Requirement
     /**
      * Constructor that initializes the requirement.
      *
-     * @param string            $cfgName            The configuration name used for ini_get()
-     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+     * @param string           $cfgName    The configuration name used for ini_get()
+     * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
                                                     or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
-     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
                                                     This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
                                                     Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
-     * @param string|null       $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
-     * @param string|null       $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
-     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
-     * @param Boolean           $optional           Whether this is only an optional recommendation not a mandatory requirement
+     * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string|null $helpHtml    The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $optional    Whether this is only an optional recommendation not a mandatory requirement
      */
     public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false)
     {
@@ -193,10 +193,10 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds a mandatory requirement.
      *
-     * @param Boolean      $fulfilled     Whether the requirement is fulfilled
-     * @param string       $testMessage   The message for testing the requirement
-     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
-     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $fulfilled   Whether the requirement is fulfilled
+     * @param string      $testMessage The message for testing the requirement
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null)
     {
@@ -206,10 +206,10 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds an optional recommendation.
      *
-     * @param Boolean      $fulfilled     Whether the recommendation is fulfilled
-     * @param string       $testMessage   The message for testing the recommendation
-     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
-     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean     $fulfilled   Whether the recommendation is fulfilled
+     * @param string      $testMessage The message for testing the recommendation
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null)
     {
@@ -219,15 +219,15 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds a mandatory requirement in form of a php.ini configuration.
      *
-     * @param string            $cfgName            The configuration name used for ini_get()
-     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+     * @param string           $cfgName    The configuration name used for ini_get()
+     * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
                                                     or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
-     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
                                                     This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
                                                     Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
-     * @param string            $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
-     * @param string            $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
-     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param string      $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
     {
@@ -237,15 +237,15 @@ class RequirementCollection implements IteratorAggregate
     /**
      * Adds an optional recommendation in form of a php.ini configuration.
      *
-     * @param string            $cfgName            The configuration name used for ini_get()
-     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+     * @param string           $cfgName    The configuration name used for ini_get()
+     * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
                                                     or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
-     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+     * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
                                                     This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
                                                     Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
-     * @param string            $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
-     * @param string            $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
-     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param string      $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string      $helpHtml    The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null $helpText    The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
      */
     public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
     {
@@ -430,8 +430,15 @@ class SymfonyRequirements extends RequirementCollection
         );
 
         if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
+            $timezones = array();
+            foreach (DateTimeZone::listAbbreviations() as $abbreviations) {
+                foreach ($abbreviations as $abbreviation) {
+                    $timezones[$abbreviation['timezone_id']] = true;
+                }
+            }
+
             $this->addRequirement(
-                (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
+                isset($timezones[date_default_timezone_get()]),
                 sprintf('Configured default timezone "%s" must be supported by your installation of PHP', date_default_timezone_get()),
                 'Your default timezone is not supported by PHP. Check for typos in your <strong>php.ini</strong> file and have a look at the list of deprecated timezones at <a href="http://php.net/manual/en/timezones.others.php">http://php.net/manual/en/timezones.others.php</a>.'
             );
@@ -495,6 +502,14 @@ class SymfonyRequirements extends RequirementCollection
             $this->addPhpIniRequirement(
                 'xdebug.scream', false, true
             );
+
+            $this->addPhpIniRecommendation(
+                'xdebug.max_nesting_level',
+                create_function('$cfgValue', 'return $cfgValue > 100;'),
+                true,
+                'xdebug.max_nesting_level should be above 100 in php.ini',
+                'Set "<strong>xdebug.max_nesting_level</strong>" to e.g. "<strong>250</strong>" in php.ini<a href="#phpini">*</a> to stop Xdebug\'s infinite recursion protection erroneously throwing a fatal error in your project.'
+            );
         }
 
         $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
@@ -518,7 +533,7 @@ class SymfonyRequirements extends RequirementCollection
             'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions',
             'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.'
         );
-        
+
         $this->addRecommendation(
             version_compare($installedPhpVersion, '5.3.8', '>='),
             'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156',

vendor/symfony/monolog-bundle/Symfony/Bundle/MonologBundle/composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/monolog-bridge": ">=2.1.0,<2.3-dev",
+        "symfony/monolog-bridge": "2.1.*",
         "symfony/dependency-injection": ">=2.1.0,<2.3-dev",
         "symfony/config": ">=2.1.0,<2.3-dev",
         "monolog/monolog": ">=1.0,<1.3-dev"

vendor/symfony/symfony/README.md

@@ -27,6 +27,9 @@ work for you:
  * before PHP 5.3.8, if you get an error involving annotations, you've hit a
    known PHP bug (see https://bugs.php.net/bug.php?id=55156).
 
+ * PHP 5.3.16 has a major bug in the Reflection subsystem and is not suitable to
+   run Symfony2 (https://bugs.php.net/bug.php?id=62715)
+
 Installation
 ------------
 

vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Client.php

@@ -78,7 +78,7 @@ class Client extends BaseClient
             $this->hasPerformedRequest = true;
         }
 
-        return $this->kernel->handle($request);
+        return parent::doRequest($request);
     }
 
     /**

vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php

@@ -236,10 +236,12 @@ EOF
         $default = (string) $default != '' ? ' '.$default : '';
         $comments = count($comments) ? '# '.implode(', ', $comments) : '';
 
-        $text = sprintf('%-20s %s %s', $node->getName().':', $default, $comments);
+        $text = rtrim(sprintf('%-20s %s %s', $node->getName() . ':', $default, $comments), ' ');
 
         if ($info = $node->getInfo()) {
             $this->outputLine('');
+            // indenting multi-line info
+            $info = str_replace("\n", sprintf("\n%" . $depth * 4 . "s# ", ' '), $info);
             $this->outputLine('# '.$info, $depth * 4);
         }
 

vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php

@@ -21,9 +21,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 /**
  * Sets the session in the request.
  *
- * This will also start the session if it was already started during a previous
- * request.
- *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
 class SessionListener implements EventSubscriberInterface

vendor/symfony/symfony/src/Symfony/Component/ClassLoader/DebugClassLoader.php

@@ -82,6 +82,10 @@ class DebugClassLoader
             require $file;
 
             if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
+                if (false !== strpos($class, '/')) {
+                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
+                }
+
                 throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
             }
 

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Container.php

@@ -334,8 +334,10 @@ class Container implements IntrospectableContainerInterface
             unset($this->scopedServices[$name]);
 
             foreach ($this->scopeChildren[$name] as $child) {
-                $services[$child] = $this->scopedServices[$child];
-                unset($this->scopedServices[$child]);
+                if (isset($this->scopedServices[$child])) {
+                    $services[$child] = $this->scopedServices[$child];
+                    unset($this->scopedServices[$child]);
+                }
             }
 
             // update global map

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -734,19 +734,22 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @throws RuntimeException When the scope is inactive
      * @throws RuntimeException When the factory definition is incomplete
+     * @throws RuntimeException When the service is a synthetic service
      * @throws InvalidArgumentException When configure callable is not callable
      */
     private function createService(Definition $definition, $id)
     {
+        if ($definition->isSynthetic()) {
+            throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
+        }
+
         $parameterBag = $this->getParameterBag();
 
         if (null !== $definition->getFile()) {
             require_once $parameterBag->resolveValue($definition->getFile());
         }
 
-        $arguments = $this->resolveServices(
-            $parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments()))
-        );
+        $arguments = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments())));
 
         if (null !== $definition->getFactoryMethod()) {
             if (null !== $definition->getFactoryClass()) {

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php

@@ -15,6 +15,8 @@ use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * GraphvizDumper dumps a service container as a graphviz file.
@@ -159,7 +161,7 @@ class GraphvizDumper extends Dumper
     {
         $nodes = array();
 
-        $container = clone $this->container;
+        $container = $this->cloneContainer();
 
         foreach ($container->getDefinitions() as $id => $definition) {
             $nodes[$id] = array('class' => str_replace('\\', '\\\\', $this->container->getParameterBag()->resolveValue($definition->getClass())), 'attributes' => array_merge($this->options['node.definition'], array('style' => ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope() ? 'filled' : 'dotted')));
@@ -175,13 +177,32 @@ class GraphvizDumper extends Dumper
             }
 
             if (!$container->hasDefinition($id)) {
-                $nodes[$id] = array('class' => str_replace('\\', '\\\\', get_class($service)), 'attributes' => $this->options['node.instance']);
+                $class = ('service_container' === $id) ? get_class($this->container) : get_class($service);
+                $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => $this->options['node.instance']);
             }
         }
 
         return $nodes;
     }
 
+    private function cloneContainer()
+    {
+        $parameterBag = new ParameterBag($this->container->getParameterBag()->all());
+
+        $container = new ContainerBuilder($parameterBag);
+        $container->setDefinitions($this->container->getDefinitions());
+        $container->setAliases($this->container->getAliases());
+        $container->setResources($this->container->getResources());
+        foreach ($this->container->getScopes() as $scope) {
+            $container->addScope($scope);
+        }
+        foreach ($this->container->getExtensions() as $extension) {
+            $container->registerExtension($extension);
+        }
+
+        return $container;
+    }
+
     /**
      * Returns the start dot.
      *

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -955,11 +955,11 @@ EOF;
      *
      * @return Boolean
      */
-    private function hasReference($id, array $arguments, $deep = false)
+    private function hasReference($id, array $arguments, $deep = false, $visited = array())
     {
         foreach ($arguments as $argument) {
             if (is_array($argument)) {
-                if ($this->hasReference($id, $argument, $deep)) {
+                if ($this->hasReference($id, $argument, $deep, $visited)) {
                     return true;
                 }
             } elseif ($argument instanceof Reference) {
@@ -967,11 +967,13 @@ EOF;
                     return true;
                 }
 
-                if ($deep) {
+                if ($deep && !isset($visited[(string) $argument])) {
+                    $visited[(string) $argument] = true;
+
                     $service = $this->container->getDefinition((string) $argument);
                     $arguments = array_merge($service->getMethodCalls(), $service->getArguments(), $service->getProperties());
 
-                    if ($this->hasReference($id, $arguments, $deep)) {
+                    if ($this->hasReference($id, $arguments, $deep, $visited)) {
                         return true;
                     }
                 }

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

@@ -320,6 +320,17 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
+     * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
+     * @expectedException \RuntimeException
+     */
+    public function testCreateSyntheticService()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'FooClass')->setSynthetic(true);
+        $builder->get('foo');
+    }
+
+    /**
      * @covers Symfony\Component\DependencyInjection\ContainerBuilder::resolveServices
      */
     public function testResolveServices()

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

@@ -261,6 +261,38 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($container->has('a'));
     }
 
+    public function testEnterScopeRecursivelyWithInactiveChildScopes()
+    {
+        $container = new Container();
+        $container->addScope(new Scope('foo'));
+        $container->addScope(new Scope('bar', 'foo'));
+
+        $this->assertFalse($container->isScopeActive('foo'));
+
+        $container->enterScope('foo');
+
+        $this->assertTrue($container->isScopeActive('foo'));
+        $this->assertFalse($container->isScopeActive('bar'));
+        $this->assertFalse($container->has('a'));
+
+        $a = new \stdClass();
+        $container->set('a', $a, 'foo');
+
+        $services = $this->getField($container, 'scopedServices');
+        $this->assertTrue(isset($services['foo']['a']));
+        $this->assertSame($a, $services['foo']['a']);
+
+        $this->assertTrue($container->has('a'));
+        $container->enterScope('foo');
+
+        $services = $this->getField($container, 'scopedServices');
+        $this->assertFalse(isset($services['a']));
+
+        $this->assertTrue($container->isScopeActive('foo'));
+        $this->assertFalse($container->isScopeActive('bar'));
+        $this->assertFalse($container->has('a'));
+    }
+
     public function testLeaveScopeNotActive()
     {
         $container = new Container();

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php

@@ -55,4 +55,18 @@ class GraphvizDumperTest extends \PHPUnit_Framework_TestCase
             'node.missing' => array('fillcolor' => 'red', 'style' => 'empty'),
         )), str_replace('%path%', __DIR__, file_get_contents(self::$fixturesPath.'/graphviz/services10-1.dot')), '->dump() dumps services');
     }
+
+    public function testDumpWithFrozenContainer()
+    {
+        $container = include self::$fixturesPath.'/containers/container13.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertEquals(str_replace('%path%', __DIR__, file_get_contents(self::$fixturesPath.'/graphviz/services13.dot')), $dumper->dump(), '->dump() dumps services');
+    }
+
+    public function testDumpWithFrozenCustomClassContainer()
+    {
+        $container = include self::$fixturesPath.'/containers/container14.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertEquals(str_replace('%path%', __DIR__, file_get_contents(self::$fixturesPath.'/graphviz/services14.dot')), $dumper->dump(), '->dump() dumps services');
+    }
 }

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container13.php

@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+$container = new ContainerBuilder();
+$container->
+    register('foo', 'FooClass')->
+    addArgument(new Reference('bar'))
+;
+$container->
+    register('bar', 'BarClass')
+;
+$container->compile();
+
+return $container;

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Container14;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ProjectServiceContainer extends ContainerBuilder
+{
+}
+
+return new ProjectServiceContainer();

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services13.dot

@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_bar [label="bar\nBarClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
+  node_foo -> node_bar [label="" style="filled"];
+}

vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services14.dot

@@ -0,0 +1,7 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container\nContainer14\\ProjectServiceContainer\n", shape=record, fillcolor="#9999ff", style="filled"];
+}

vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/EventDispatcher.php

@@ -106,7 +106,7 @@ class EventDispatcher implements EventDispatcherInterface
         }
 
         foreach ($this->listeners[$eventName] as $priority => $listeners) {
-            if (false !== ($key = array_search($listener, $listeners))) {
+            if (false !== ($key = array_search($listener, $listeners, true))) {
                 unset($this->listeners[$eventName][$priority][$key], $this->sorted[$eventName]);
             }
         }

vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php

@@ -244,6 +244,29 @@ class EventDispatcherTest extends \PHPUnit_Framework_TestCase
         $this->dispatcher->dispatch('test');
         $this->assertSame($this->dispatcher, $dispatcher);
     }
+
+    /**
+     * @see https://bugs.php.net/bug.php?id=62976
+     *
+     * This bug affects:
+     *  - The PHP 5.3 branch for versions < 5.3.18
+     *  - The PHP 5.4 branch for versions < 5.4.8
+     *  - The PHP 5.5 branch is not affected
+     */
+    public function testWorkaroundForPhpBug62976()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('bug.62976', new CallableClass());
+        $dispatcher->removeListener('bug.62976', function() {});
+        $this->assertTrue($dispatcher->hasListeners('bug.62976'));
+    }
+}
+
+class CallableClass
+{
+    public function __invoke()
+    {
+    }
 }
 
 class TestEventListener

vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php

@@ -77,7 +77,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
 
         $type = trim(ob_get_clean());
 
-        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-]+)#i', $type, $match)) {
+        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
             // it's not a type, but an error message
             return null;
         }

vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php

@@ -1427,12 +1427,16 @@ class Request
         if ($this->headers->has('X_ORIGINAL_URL') && false !== stripos(PHP_OS, 'WIN')) {
             // IIS with Microsoft Rewrite Module
             $requestUri = $this->headers->get('X_ORIGINAL_URL');
+            $this->headers->remove('X_ORIGINAL_URL');
         } elseif ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) {
             // IIS with ISAPI_Rewrite
             $requestUri = $this->headers->get('X_REWRITE_URL');
+            $this->headers->remove('X_REWRITE_URL');
         } elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') {
             // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
             $requestUri = $this->server->get('UNENCODED_URL');
+            $this->server->remove('UNENCODED_URL');
+            $this->server->remove('IIS_WasUrlRewritten');
         } elseif ($this->server->has('REQUEST_URI')) {
             $requestUri = $this->server->get('REQUEST_URI');
             // HTTP proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
@@ -1446,8 +1450,12 @@ class Request
             if ('' != $this->server->get('QUERY_STRING')) {
                 $requestUri .= '?'.$this->server->get('QUERY_STRING');
             }
+            $this->server->remove('ORIG_PATH_INFO');
         }
 
+        // normalize the request URI to ease creating sub-requests from this request
+        $this->server->set('REQUEST_URI', $requestUri);
+
         return $requestUri;
     }
 

vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php

@@ -332,9 +332,9 @@ class NativeSessionStorage implements SessionStorageInterface
      * Registers save handler as a PHP session handler.
      *
      * To use internal PHP session save handlers, override this method using ini_set with
-     * session.save_handlers and session.save_path e.g.
+     * session.save_handler and session.save_path e.g.
      *
-     *     ini_set('session.save_handlers', 'files');
+     *     ini_set('session.save_handler', 'files');
      *     ini_set('session.save_path', /tmp');
      *
      * @see http://php.net/session-set-save-handler

vendor/symfony/symfony/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php

@@ -443,6 +443,18 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
             $this->esi->addSurrogateEsiCapability($request);
         }
 
+        // modify the X-Forwarded-For header if needed
+        $forwardedFor = $request->headers->get('X-Forwarded-For');
+        if ($forwardedFor) {
+            $request->headers->set('X-Forwarded-For', $forwardedFor.', '.$request->server->get('REMOTE_ADDR'));
+        } else {
+            $request->headers->set('X-Forwarded-For', $request->server->get('REMOTE_ADDR'));
+        }
+
+        // fix the client IP address by setting it to 127.0.0.1 as HttpCache
+        // is always called from the same process as the backend.
+        $request->server->set('REMOTE_ADDR', '127.0.0.1');
+
         // always a "master" request (as the real master request can be in cache)
         $response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $catch);
         // FIXME: we probably need to also catch exceptions if raw === true

vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php

@@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $classes;
     protected $errorReportingLevel;
 
-    const VERSION         = '2.1.7';
-    const VERSION_ID      = '20107';
+    const VERSION         = '2.1.8-DEV';
+    const VERSION_ID      = '20108';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '1';
-    const RELEASE_VERSION = '7';
-    const EXTRA_VERSION   = '';
+    const RELEASE_VERSION = '8';
+    const EXTRA_VERSION   = 'DEV';
 
     /**
      * Constructor.

vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php

@@ -39,7 +39,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
         $this->folder = substr($dsn, 5);
 
         if (!is_dir($this->folder)) {
-            mkdir($this->folder);
+            mkdir($this->folder, 0777, true);
         }
     }
 

vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php

@@ -1034,4 +1034,45 @@ class HttpCacheTest extends HttpCacheTestCase
         $this->assertEquals('Hello World!', $this->response->getContent());
         $this->assertEquals(12, $this->response->headers->get('Content-Length'));
     }
+
+    public function testClientIpIsAlwaysLocalhostForForwardedRequests()
+    {
+        $this->setNextResponse();
+        $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
+
+        $this->assertEquals('127.0.0.1', $this->kernel->getBackendRequest()->server->get('REMOTE_ADDR'));
+    }
+
+    /**
+     * @dataProvider getXForwardedForData
+     */
+    public function testXForwarderForHeaderForForwardedRequests($xForwardedFor, $expected)
+    {
+        $this->setNextResponse();
+        $server = array('REMOTE_ADDR' => '10.0.0.1');
+        if (false !== $xForwardedFor) {
+            $server['HTTP_X_FORWARDED_FOR'] = $xForwardedFor;
+        }
+        $this->request('GET', '/', $server);
+
+        $this->assertEquals($expected, $this->kernel->getBackendRequest()->headers->get('X-Forwarded-For'));
+    }
+
+    public function getXForwardedForData()
+    {
+        return array(
+            array(false, '10.0.0.1'),
+            array('10.0.0.2', '10.0.0.2, 10.0.0.1'),
+            array('10.0.0.2, 10.0.0.3', '10.0.0.2, 10.0.0.3, 10.0.0.1'),
+        );
+    }
+
+    public function testXForwarderForHeaderForPassRequests()
+    {
+        $this->setNextResponse();
+        $server = array('REMOTE_ADDR' => '10.0.0.1');
+        $this->request('POST', '/', $server);
+
+        $this->assertEquals('10.0.0.1', $this->kernel->getBackendRequest()->headers->get('X-Forwarded-For'));
+    }
 }

vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php

@@ -26,6 +26,7 @@ class TestHttpKernel extends HttpKernel implements ControllerResolverInterface
     protected $called;
     protected $customizer;
     protected $catch;
+    protected $backendRequest;
 
     public function __construct($body, $status, $headers, \Closure $customizer = null)
     {
@@ -39,9 +40,15 @@ class TestHttpKernel extends HttpKernel implements ControllerResolverInterface
         parent::__construct(new EventDispatcher(), $this);
     }
 
+    public function getBackendRequest()
+    {
+        return $this->backendRequest;
+    }
+
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
     {
         $this->catch = $catch;
+        $this->backendRequest = $request;
 
         return parent::handle($request, $type, $catch);
     }

vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php

@@ -25,6 +25,7 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
     protected $headers;
     protected $catch;
     protected $call;
+    protected $backendRequest;
 
     public function __construct($responses)
     {
@@ -42,8 +43,15 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
         parent::__construct(new EventDispatcher(), $this);
     }
 
+    public function getBackendRequest()
+    {
+        return $this->backendRequest;
+    }
+
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
     {
+        $this->backendRequest = $request;
+
         return parent::handle($request, $type, $catch);
     }
 

vendor/symfony/symfony/src/Symfony/Component/Process/Process.php

@@ -213,6 +213,9 @@ class Process
             $this->fileHandles = array(
                 self::STDOUT => tmpfile(),
             );
+            if (false === $this->fileHandles[self::STDOUT]) {
+                throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
+            }
             $this->readBytes = array(
                 self::STDOUT => 0,
             );