Issue #2366043 by dawehner: Upgrade to Symfony 2.6

composer.json

@@ -6,16 +6,17 @@
   "require": {
     "php": ">=5.4.5",
     "sdboyer/gliph": "0.1.*",
-    "symfony/class-loader": "2.5.*",
-    "symfony/css-selector": "2.5.*",
-    "symfony/dependency-injection": "2.5.*",
-    "symfony/event-dispatcher": "2.5.*",
-    "symfony/http-foundation": "2.5.*",
-    "symfony/http-kernel": "2.5.*",
-    "symfony/routing": "2.5.*",
-    "symfony/serializer": "2.5.*",
-    "symfony/validator": "2.5.*",
-    "symfony/yaml": "dev-master#499f7d7aa96747ad97940089bd7a1fb24ad8182a",
+    "symfony/class-loader": "2.6.0-beta1",
+    "symfony/css-selector": "2.6.0-beta1",
+    "symfony/debug": "2.6.0-beta1",
+    "symfony/dependency-injection": "2.6.0-beta1",
+    "symfony/event-dispatcher": "2.6.0-beta1",
+    "symfony/http-foundation": "2.6.0-beta1",
+    "symfony/http-kernel": "2.6.0-beta1",
+    "symfony/routing": "2.6.0-beta1",
+    "symfony/serializer": "2.6.0-beta1",
+    "symfony/validator": "2.6.0-beta1",
+    "symfony/yaml": "2.6.0-beta1",
     "twig/twig": "1.16.*",
     "doctrine/common": "dev-master#a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
     "doctrine/annotations": "1.2.*",

core/lib/Drupal/Core/Routing/CompiledRoute.php

@@ -173,4 +173,30 @@ public function getRequirements() {
     return $this->route->getRequirements();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function serialize() {
+    $data = unserialize(parent::serialize());
+    $data['fit'] = $this->fit;
+    $data['patternOutline'] = $this->patternOutline;
+    $data['numParts'] = $this->numParts;
+
+    return serialize($data);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function unserialize($serialized)
+  {
+    parent::unserialize($serialized);
+    $data = unserialize($serialized);
+
+    $this->fit = $data['fit'];
+    $this->patternOutline = $data['patternOutline'];
+    $this->numParts = $data['numParts'];
+  }
+
+
 }

core/vendor/composer/autoload_namespaces.php

@@ -16,7 +16,6 @@
     'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
     'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
     'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
-    'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
     'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
     'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
     'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),

core/vendor/egulias/email-validator/README.md

-EmailValidator [![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/b18d473e-bd5a-4d88-a7b2-7aeaee0ebd7b/small.png)](https://insight.sensiolabs.com/projects/b18d473e-bd5a-4d88-a7b2-7aeaee0ebd7b)[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master)
+EmailValidator [![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6/small.png)](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master)
 =============================
 
 ##Installation##
-Install via composer. Add to your current compooser.json ```require``` key: ```"egulias/email-validator":"1.0.x-dev" ```
+
+Run the command below to install via Composer
+
+```shell
+composer require egulias/email-validator
+```
 
 ##Usage##
 
@@ -24,7 +29,7 @@ More advanced example (returns detailed diagnostic error codes):
 ```php
 <?php
 
-use egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\EmailValidator;
 
 $validator = new EmailValidator;
 $email = 'dominic@sayers.cc';
@@ -46,6 +51,6 @@ As this is a port from another library and work, here are other people related t
 * Josepf Bielawski [@stloyd](http://github.com/stloyd):      		For its first re-work of Dominic's lib
 * Dominic Sayers [@dominicsayers](http://github.com/dominicsayers):  	The original isemail function
 
-##Licence##
-Released under the MIT Licence attached with this code.
+##License##
+Released under the MIT License attached with this code.
 

core/vendor/egulias/email-validator/composer.json

@@ -10,7 +10,7 @@
   ],
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0.x-dev"
+      "dev-master": "1.3.x-dev"
     }
   },
   "require":      {

core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php

@@ -31,10 +31,13 @@ class EmailLexer extends AbstractLexer
     const S_SEMICOLON        = 275;
     const S_OPENQBRACKET     = 276;
     const S_CLOSEQBRACKET    = 277;
+    const S_SLASH            = 278;
     const S_EMPTY            = null;
     const GENERIC            = 300;
     const CRLF               = 301;
     const INVALID            = 302;
+    const ASCII_INVALID_FROM = 127;
+    const ASCII_INVALID_TO   = 199;
 
     /**
      * US-ASCII visible characters not valid for atext (@link http://tools.ietf.org/html/rfc5322#section-3.2.3)
@@ -52,6 +55,7 @@ class EmailLexer extends AbstractLexer
         ';'    => self::S_SEMICOLON,
         '@'    => self::S_AT,
         '\\'   => self::S_BACKSLASH,
+        '/'    => self::S_SLASH,
         ','    => self::S_COMMA,
         '.'    => self::S_DOT,
         '"'    => self::S_DQUOTE,
@@ -67,14 +71,31 @@ class EmailLexer extends AbstractLexer
         '>'    => self::S_GREATERTHAN,
         '{'    => self::S_OPENQBRACKET,
         '}'    => self::S_CLOSEQBRACKET,
-        ''     => self::S_EMPTY
+        ''     => self::S_EMPTY,
+        '\0'   => self::C_NUL,
     );
 
+    protected $invalidASCII = array(226 => 1,);
+
+    protected $hasInvalidTokens = false;
+
     protected $previous;
 
+    public function reset()
+    {
+        $this->hasInvalidTokens = false;
+        parent::reset();
+    }
+
+    public function hasInvalidTokens()
+    {
+        return $this->hasInvalidTokens;
+    }
+
     /**
      * @param $type
      * @throws \UnexpectedValueException
+     * @return boolean
      */
     public function find($type)
     {
@@ -100,7 +121,7 @@ public function getPrevious()
     /**
      * moveNext
      *
-     * @return mixed
+     * @return boolean
      */
     public function moveNext()
     {
@@ -112,7 +133,7 @@ public function moveNext()
     /**
      * Lexical catchable patterns.
      *
-     * @return array
+     * @return string[]
      */
     protected function getCatchablePatterns()
     {
@@ -130,7 +151,7 @@ protected function getCatchablePatterns()
     /**
      * Lexical non-catchable patterns.
      *
-     * @return array
+     * @return string[]
      */
     protected function getNonCatchablePatterns()
     {
@@ -146,14 +167,48 @@ protected function getNonCatchablePatterns()
      */
     protected function getType(&$value)
     {
+
+        if ($this->isNullType($value)) {
+            return self::C_NUL;
+        }
+
         if (isset($this->charValue[$value])) {
             return $this->charValue[$value];
         }
 
-        if (preg_match('/[\x10-\x1F]+/', $value)) {
+        if ($this->isInvalid($value)) {
+            $this->hasInvalidTokens = true;
             return self::INVALID;
         }
 
         return  self::GENERIC;
     }
+
+    /**
+     * @param string $value
+     */
+    protected function isNullType($value)
+    {
+        if ($value === "\0") {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $value
+     */
+    protected function isInvalid($value)
+    {
+        if (preg_match('/[\x10-\x1F]+/', $value)) {
+            return true;
+        }
+
+        if (isset($this->invalidASCII[ord($value)])) {
+            return true;
+        }
+
+        return false;
+    }
 }

core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php

@@ -28,6 +28,9 @@ public function __construct(EmailLexer $lexer)
         $this->domainPartParser = new DomainPart($this->lexer);
     }
 
+    /**
+     * @param string $str
+     */
     public function parse($str)
     {
         $this->lexer->setInput($str);
@@ -36,6 +39,10 @@ public function parse($str)
             throw new \InvalidArgumentException('ERR_NOLOCALPART');
         }
 
+        if ($this->lexer->hasInvalidTokens()) {
+            throw new \InvalidArgumentException('ERR_INVALID_ATEXT');
+        }
+
         $this->localPartParser->parse($str);
         $this->domainPartParser->parse($str);
 
@@ -78,6 +85,10 @@ protected function hasAtToken()
         return true;
     }
 
+    /**
+     * @param string $localPart
+     * @param string $parsedDomainPart
+     */
     protected function addLongEmailWarning($localPart, $parsedDomainPart)
     {
         if (strlen($localPart . '@' . $parsedDomainPart) > self::EMAIL_MAX_LENGTH) {

core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php

@@ -2,8 +2,6 @@
 
 namespace Egulias\EmailValidator;
 
-use Egulias\EmailValidator\Parser\LocalPart;
-
 /**
  * EmailValidator
  *
@@ -97,7 +95,7 @@ public function isValid($email, $checkDNS = false, $strict = false)
             return false;
         }
 
-        return ($strict) ? (!$this->hasWarnings() && $dns) : true;
+        return !$strict || (!$this->hasWarnings() && $dns);
     }
 
     /**
@@ -146,16 +144,9 @@ public function getThreshold()
 
     protected function checkDNS()
     {
-        $checked = false;
-        if (!function_exists('dns_get_record') && (
-            in_array(self::DNSWARN_NO_RECORD, $this->warnings) &&
-            in_array(self::DNSWARN_NO_MX_RECORD, $this->warnings)
-        )) {
-            return $checked;
-        }
+        $checked = true;
 
         $result = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX');
-        $checked = true;
 
         if (!$result) {
             $this->warnings[] = self::DNSWARN_NO_RECORD;

core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php

@@ -23,6 +23,9 @@ public function parse($domainPart)
         if ($this->lexer->token['type'] === EmailLexer::S_EMPTY) {
             throw new \InvalidArgumentException('ERR_NODOMAIN');
         }
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+            throw new \InvalidArgumentException('ERR_DOMAINHYPHENEND');
+        }
 
         if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
             $this->warnings[] = EmailValidator::DEPREC_COMMENT;
@@ -103,6 +106,10 @@ protected function doParseDomainPart()
         do {
             $prev = $this->lexer->getPrevious();
 
+            if ($this->lexer->token['type'] === EmailLexer::S_SLASH) {
+                throw new \InvalidArgumentException('ERR_DOMAIN_CHAR_NOT_ALLOWED');
+            }
+
             if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
                 $this->parseComments();
                 $this->lexer->moveNext();
@@ -210,6 +217,9 @@ protected function doParseDomainLiteral()
         return $addressLiteral;