minor fixes

nicolas-grekas · nicolas-grekas · commit 3cfdc9e9d739 · 2018-07-09T17:54:21.000+02:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -53,7 +53,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') || ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);
+            $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', $id);
         }
 
         if (null === $factoryCode) {
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -99,7 +99,7 @@ public function getPrivatePublicDefinitions()
             array(
                 (new Definition(__CLASS__))
                     ->setPublic(false),
-                \method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates',
+                'privates',
             ),
             array(
                 (new Definition(__CLASS__))
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "symfony/dependency-injection": "~3.4|~4.0",
+        "symfony/dependency-injection": "~4.0",
         "ocramius/proxy-manager": "~2.1"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
@@ -76,12 +76,12 @@ public function unmarshall(string $value)
                     return $value;
                 }
             } elseif (false === $igbinaryNull) {
-                throw new \RuntimeException('Failed to unserialize cached value, did you forget to install the "igbinary" extension?');
+                throw new \RuntimeException('Failed to unserialize values, did you forget to install the "igbinary" extension?');
             } elseif (null !== $value = igbinary_unserialize($value)) {
                 return $value;
             }
 
-            throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize cached value');
+            throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize values.');
         } catch (\Error $e) {
             throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
         } finally {
diff --git a/src/Symfony/Component/Cache/Marshaller/MarshallerInterface.php b/src/Symfony/Component/Cache/Marshaller/MarshallerInterface.php
@@ -14,7 +14,7 @@
 /**
  * Serializes/unserializes PHP values.
  *
- * Implementations of this interface MUST deal with errors carefuly. They MUST
+ * Implementations of this interface MUST deal with errors carefully. They MUST
  * also deal with forward and backward compatibility at the storage format level.
  *
  * @author Nicolas Grekas <p@tchwork.com>

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =`
`53`	`53`	`$instantiation = 'return';`
`54`	`54`
`55`	`55`	`if ($definition->isShared()) {`
`56`		`- $instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') \|\| ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);`
	`56`	`+ $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', $id);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (null === $factoryCode) {`
Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,12 @@ public function unmarshall(string $value)`
`76`	`76`	`return $value;`
`77`	`77`	`}`
`78`	`78`	`} elseif (false === $igbinaryNull) {`
`79`		`- throw new \RuntimeException('Failed to unserialize cached value, did you forget to install the "igbinary" extension?');`
	`79`	`+ throw new \RuntimeException('Failed to unserialize values, did you forget to install the "igbinary" extension?');`
`80`	`80`	`} elseif (null !== $value = igbinary_unserialize($value)) {`
`81`	`81`	`return $value;`
`82`	`82`	`}`
`83`	`83`
`84`		`- throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize cached value');`
	`84`	`+ throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize values.');`
`85`	`85`	`} catch (\Error $e) {`
`86`	`86`	`throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());`
`87`	`87`	`} finally {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`5DD3 /**`
`15`	`15`	`* Serializes/unserializes PHP values.`
`16`	`16`	`*`
`17`		`- * Implementations of this interface MUST deal with errors carefuly. They MUST`
	`17`	`+ * Implementations of this interface MUST deal with errors carefully. They MUST`
`18`	`18`	`* also deal with forward and backward compatibility at the storage format level.`
`19`	`19`	`*`
`20`	`20`	`* @author Nicolas Grekas <p@tchwork.com>`