8000 minor fixes · symfony/symfony@3cfdc9e · GitHub
[go: up one dir, main page]

Skip to content

Commit 3cfdc9e

Browse files
minor fixes
1 parent a5709ee commit 3cfdc9e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
5353
$instantiation = 'return';
5454

5555
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);
5757
}
5858

5959
if (null === $factoryCode) {

src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function getPrivatePublicDefinitions()
9999
array(
100100
(new Definition(__CLASS__))
101101
->setPublic(false),
102-
\method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates',
102+
'privates',
103103
),
104104
array(
105105
(new Definition(__CLASS__))

src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"symfony/dependency-injection": "~3.4|~4.0",
20+
"symfony/dependency-injection": "~4.0",
2121
"ocramius/proxy-manager": "~2.1"
2222
},
2323
"require-dev": {

src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ public function unmarshall(string $value)
7676
return $value;
7777
}
7878
} 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?');
8080
} elseif (null !== $value = igbinary_unserialize($value)) {
8181
return $value;
8282
}
8383

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.');
8585
} catch (\Error $e) {
8686
throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
8787
} finally {

src/Symfony/Component/Cache/Marshaller/MarshallerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* Serializes/unserializes PHP values.
1616
*
17-
* Implementations of this interface MUST deal with errors carefuly. They MUST
17+
* Implementations of this interface MUST deal with errors carefully. They MUST
1818
* also deal with forward and backward compatibility at the storage format level.
1919
*
2020
* @author Nicolas Grekas <p@tchwork.com>

0 commit comments

Comments
 (0)
0