Merge branch '2.7' into 2.8

* 2.7:
  Fix undefined array $server
  Fix bug in windows detection
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  [Serializer] ObjectNormalizer: don't serialize static methods and props
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Component/Security/phpunit.xml.dist

Author: nicolas-grekas

Normalizer/ObjectNormalizer.php

@@ -68,6 +68,7 @@ public function normalize($object, $format = null, array $context = array())
             $reflClass = new \ReflectionClass($object);
             foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
                 if (
+                    !$reflMethod->isStatic() &&
                     !$reflMethod->isConstructor() &&
                     !$reflMethod->isDestructor() &&
                     0 === $reflMethod->getNumberOfRequiredParameters()
@@ -86,7 +87,9 @@ public function normalize($object, $format = null, array $context = array())
 
             // properties
             foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
-                $attributes[$reflProperty->getName()] = true;
+                if (!$reflProperty->isStatic()) {
+                    $attributes[$reflProperty->getName()] = true;
+                }
             }
 
             $attributes = array_keys($attributes);

Tests/Normalizer/ObjectNormalizerTest.php

@@ -456,6 +456,11 @@ public function testNoTraversableSupport()
     {
         $this->assertFalse($this->normalizer->supportsNormalization(new \ArrayObject()));
     }
+
+    public function testNormalizeStatic()
+    {
+        $this->assertEquals(array('foo' => 'K'), $this->normalizer->normalize(new ObjectWithStaticPropertiesAndMethods()));
+    }
 }
 
 class ObjectDummy
@@ -605,3 +610,14 @@ public function otherMethod()
         throw new \RuntimeException('Dummy::otherMethod() should not be called');
     }
 }
+
+class ObjectWithStaticPropertiesAndMethods
+{
+    public $foo = 'K';
+    public static $bar = 'A';
+
+    public static function getBaz()
+    {
+        return 'L';
+    }
+}

phpunit.xml.dist

@@ -20,8 +20,8 @@
         <whitelist>
             <directory>./</directory>
             <exclude>
-                <directory>./vendor</directory>
                 <directory>./Tests</directory>
+                <directory>./vendor</directory>
             </exclude>
         </whitelist>
     </filter>