8000 Merge branch '4.1' into 4.2 · symfony/cache@467a736 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
{"payload":{"commit":{"oid":"467a73628f042d4f7fc2fd00a81c9d2b55fa8abb","url":"/symfony/cache/commit/467a73628f042d4f7fc2fd00a81c9d2b55fa8abb","authoredDate":"2018-12-13T13:39:50.000+01:00","committedDate":"2018-12-13T13:39:50.000+01:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eMerge branch '4.1' into 4.2\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"* 4.1:\n Fix typos in doc blocks\n [Debug] ignore underscore vs backslash namespaces in DebugClassLoader\n [TwigBridge][Form] Prevent multiple rendering of form collection prototypes\n [FrameworkBundle] fix describing routes with no controllers\n [DI] move RegisterServiceSubscribersPass before DecoratorServicePass\n Update ValidationListener.php\n [Yaml] ensures that the mb_internal_encoding is reset to its initial value\n [WebLink] Fixed documentation link\n [Security] getTargetPath of TargetPathTrait must return string or null\n [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument\n Optimize perf by replacing call_user_func with dynamic vars\n [Routing] fix dumping same-path routes with placeholders\n [Security] defer log message in guard authenticator\n [Validator] Added IBAN format for Vatican City State\n merge conflicts\n filter out invalid Intl values\n filter out invalid language values\n [Validator] Fixed grouped composite constraints\n [Form] Filter arrays out of scalar form types\n Fix HeaderBag::get phpdoc","authors":[{"login":"nicolas-grekas","displayName":"Nicolas Grekas","avatarUrl":"https://avatars.githubusercontent.com/u/243674?v=4","path":"/nicolas-grekas","isGitHub":false}],"committerAttribution":false,"committer":{"login":"nicolas-grekas","displayName":"Nicolas Grekas","avatarUrl":"https://avatars.githubusercontent.com/u/243674?v=4","path":"/nicolas-grekas","isGitHub":false},"parents":["2e7964c0ef6833c4d685451be3df819ef667a90b","e9ff062f5105058d414dfe02139c427f5f470376"],"globalRelayId":"MDY6Q29tbWl0NDk5NDA0ODE6NDY3YTczNjI4ZjA0MmQ0ZjdmYzJmZDAwYTgxYzlkMmI1NWZhOGFiYg==","sha1":"2e7964c0ef6833c4d685451be3df819ef667a90b","sha2":"467a73628f042d4f7fc2fd00a81c9d2b55fa8abb"},"currentUser":null,"repo":{"id":49940481,"defaultBranch":"7.3","name":"cache","ownerLogin":"symfony","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2016-01-19T09:11:27.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/143937?v=4","public":true,"private":false,"isOrgOwned":true},"diffEntryData":[{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":145,"text":"@@ -146,13 +146,13 @@ class PhpArrayAdapterWrapper extends PhpArrayAdapter","html":"@@ -146,13 +146,13 @@ class PhpArrayAdapterWrapper extends PhpArrayAdapter","displayNoNewLineWarning":false,"position":0,"left":145,"right":145},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":146,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":1,"left":146,"right":146},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":147,"text":" public function save(CacheItemInterface $item)","html":" \u003cspan class=pl-k\u003epublic\u003c/span\u003e \u003cspan class=pl-k\u003efunction\u003c/span\u003e \u003cspan class=pl-en\u003esave\u003c/span\u003e(\u003cspan class=pl-smi\u003e\u003cspan class=pl-smi\u003eCacheItemInterface\u003c/span\u003e\u003c/span\u003e \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e)","displayNoNewLineWarning":false,"position":2,"left":147,"right":147},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":148,"text":" {","html":" {","displayNoNewLineWarning":false,"position":3,"left":148,"right":148},{"stylingDirective":null,"type":"DELETION","blobLineNumber":149,"text":"- \\call_user_func(\\Closure::bind(function () use ($item) {","html":"- \u003cspan class=\"pl-en x x-first x-last\"\u003e\\call_user_func\u003c/span\u003e(\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003eitem\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":4,"left":149,"right":148},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":149,"text":"+ (\\Closure::bind(function () use ($item) {","html":"+ (\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003eitem\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":5,"left":149,"right":149},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":150,"text":" $key = $item-\u003egetKey();","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003egetKey\u003c/span\u003e();","displayNoNewLineWarning":false,"position":6,"left":150,"right":150},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":151,"text":" $this-\u003ekeys[$key] = $id = \\count($this-\u003evalues);","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003ekeys\u003c/span\u003e[\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e] = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eid\u003c/span\u003e = \u003cspan class=pl-en\u003e\\count\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003evalues\u003c/span\u003e);","displayNoNewLineWarning":false,"position":7,"left":151,"right":151},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":152,"text":" $this-\u003edata[$key] = $this-\u003evalues[$id] = $item-\u003eget();","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003edata\u003c/span\u003e[\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e] = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003evalues\u003c/span\u003e[\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eid\u003c/span\u003e] = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003eget\u003c/span\u003e();","displayNoNewLineWarning":false,"position":8,"left":152,"right":152},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":153,"text":" $this-\u003ewarmUp($this-\u003edata);","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003ewarmUp\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003edata\u003c/span\u003e);","displayNoNewLineWarning":false,"position":9,"left":153,"right":153},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":154,"text":" list($this-\u003ekeys, $this-\u003evalues) = eval(substr(file_get_contents($this-\u003efile), 6));","html":" \u003cspan class=pl-en\u003elist\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003ekeys\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003evalues\u003c/span\u003e) = \u003cspan class=pl-en\u003eeval\u003c/span\u003e(\u003cspan class=pl-en\u003esubstr\u003c/span\u003e(\u003cspan class=pl-en\u003efile_get_contents\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003efile\u003c/span\u003e), \u003cspan class=pl-c1\u003e6\u003c/span\u003e));","displayNoNewLineWarning":false,"position":10,"left":154,"right":154},{"stylingDirective":null,"type":"DELETION","blobLineNumber":155,"text":"- }, $this, PhpArrayAdapter::class));","html":"- }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, PhpArrayAdapter::class));","displayNoNewLineWarning":false,"position":11,"left":155,"right":154},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":155,"text":"+ }, $this, PhpArrayAdapter::class))();","html":"+ }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, PhpArrayAdapter::class))\u003cspan class=\"x x-first x-last\"\u003e()\u003c/span\u003e;","displayNoNewLineWarning":false,"position":12,"left":155,"right":155},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":156,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":13,"left":156,"right":156},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":157,"text":" return true;","html":" \u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-c1\u003etrue\u003c/span\u003e;","displayNoNewLineWarning":false,"position":14,"left":157,"right":157},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":158,"text":" }","html":" }","displayNoNewLineWarning":false,"position":15,"left":158,"right":158}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":159,"linesChanged":4,"newTreeEntry":{"lineCount":159,"path":"Tests/Adapter/PhpArrayAdapterTest.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"Tests/Adapter/PhpArrayAdapterTest.php","mode":100644},"linesAdded":2,"linesDeleted":2,"path":"Tests/Adapter/PhpArrayAdapterTest.php","pathDigest":"758a1f3001cee1e0abec2261cb0cde6ec355baa89bbc5fb1d51f78c0eebba9ab","status":"MODIFIED","truncatedReason":null,"oldOid":"2e7964c0ef6833c4d685451be3df819ef667a90b","newOid":"467a73628f042d4f7fc2fd00a81c9d2b55fa8abb","copilotChatReference":null,"deletedSha":"2e7964c0ef6833c4d685451be3df819ef667a90b","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":61,"text":"@@ -62,9 +62,9 @@ public function testTag()","html":"@@ -62,9 +62,9 @@ public function testTag()","displayNoNewLineWarning":false,"position":0,"left":61,"right":61},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":62,"text":" $this-\u003eassertSame($item, $item-\u003etag('foo'));","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003eassertSame\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003etag\u003c/span\u003e(\u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003efoo\u003c/span\u003e\u0026#39;\u003c/span\u003e));","displayNoNewLineWarning":false,"position":1,"left":62,"right":62},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":63,"text":" $this-\u003eassertSame($item, $item-\u003etag(array('bar', 'baz')));","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003eassertSame\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003etag\u003c/span\u003e(\u003cspan class=pl-en\u003earray\u003c/span\u003e(\u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ebar\u003c/span\u003e\u0026#39;\u003c/span\u003e, \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ebaz\u003c/span\u003e\u0026#39;\u003c/span\u003e)));","displayNoNewLineWarning":false,"position":2,"left":63,"right":63},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":64,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":3,"left":64,"right":64},{"stylingDirective":null,"type":"DELETION","blobLineNumber":65,"text":"- \\call_user_func(\\Closure::bind(function () use ($item) {","html":"- \u003cspan class=\"pl-en x x-first x-last\"\u003e\\call_user_func\u003c/span\u003e(\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003eitem\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":4,"left":65,"right":64},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":65,"text":"+ (\\Closure::bind(function () use ($item) {","html":"+ (\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003eitem\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":5,"left":65,"right":65},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":66,"text":" $this-\u003eassertSame(array('foo' =\u003e 'foo', 'bar' =\u003e 'bar', 'baz' =\u003e 'baz'), $item-\u003enewMetadata[CacheItem::METADATA_TAGS]);","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003eassertSame\u003c/span\u003e(\u003cspan class=pl-en\u003earray\u003c/span\u003e(\u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003efoo\u003c/span\u003e\u0026#39;\u003c/span\u003e =\u0026gt; \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003efoo\u003c/span\u003e\u0026#39;\u003c/span\u003e, \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ebar\u003c/span\u003e\u0026#39;\u003c/span\u003e =\u0026gt; \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ebar\u003c/span\u003e\u0026#39;\u003c/span\u003e, \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ebaz\u003c/span\u003e\u0026#39;\u003c/span\u003e =\u0026gt; \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ebaz\u003c/span\u003e\u0026#39;\u003c/span\u003e), \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eitem\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003enewMetadata\u003c/span\u003e[CacheItem::\u003cspan class=pl-c1\u003eMETADATA_TAGS\u003c/span\u003e]);","displayNoNewLineWarning":false,"position":6,"left":66,"right":66},{"stylingDirective":null,"type":"DELETION","blobLineNumber":67,"text":"- }, $this, CacheItem::class));","html":"- }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, CacheItem::class));","displayNoNewLineWarning":false,"position":7,"left":67,"right":66},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":67,"text":"+ }, $this, CacheItem::class))();","html":"+ }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, CacheItem::class))\u003cspan class=\"x x-first x-last\"\u003e()\u003c/span\u003e;","displayNoNewLineWarning":false,"position":8,"left":67,"right":67},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":68,"text":" }","html":" }","displayNoNewLineWarning":false,"position":9,"left":68,"right":68},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":69,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":10,"left":69,"right":69},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":70,"text":" /**","html":" \u003cspan class=pl-c\u003e/**\u003c/span\u003e","displayNoNewLineWarning":false,"position":11,"left":70,"right":70}],"diffNumber":1,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":98,"linesChanged":4,"newTreeEntry":{"lineCount":98,"path":"Tests/CacheItemTest.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"Tests/CacheItemTest.php","mode":100644},"linesAdded":2,"linesDeleted":2,"path":"Tests/CacheItemTest.php","pathDigest":"34ea47ecca4e55e0f118b3c73ad762f67c7f1ebd20f8c25168cdfa55f67941bf","status":"MODIFIED","truncatedReason":null,"oldOid":"2e7964c0ef6833c4d685451be3df819ef667a90b","newOid":"467a73628f042d4f7fc2fd00a81c9d2b55fa8abb","copilotChatReference":null,"deletedSha":"2e7964c0ef6833c4d685451be3df819ef667a90b","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":133,"text":"@@ -134,11 +134,11 @@ class PhpArrayCacheWrapper extends PhpArrayCache","html":"@@ -134,11 +134,11 @@ class PhpArrayCacheWrapper extends PhpArrayCache","displayNoNewLineWarning":false,"position":0,"left":133,"right":133},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":134,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":1,"left":134,"right":134},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":135,"text":" public function set($key, $value, $ttl = null)","html":" \u003cspan class=pl-k\u003epublic\u003c/span\u003e \u003cspan class=pl-k\u003efunction\u003c/span\u003e \u003cspan class=pl-en\u003eset\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalue\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ettl\u003c/span\u003e = \u003cspan class=pl-c1\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":2,"left":135,"right":135},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":136,"text":" {","html":" {","displayNoNewLineWarning":false,"position":3,"left":136,"right":136},{"stylingDirective":null,"type":"DELETION","blobLineNumber":137,"text":"- \\call_user_func(\\Closure::bind(function () use ($key, $value) {","html":"- \u003cspan class=\"pl-en x x-first x-last\"\u003e\\call_user_func\u003c/span\u003e(\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003ekey\u003c/span\u003e, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003evalue\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":4,"left":137,"right":136},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":137,"text":"+ (\\Closure::bind(function () use ($key, $value) {","html":"+ (\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003ekey\u003c/span\u003e, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003evalue\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":5,"left":137,"right":137},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":138,"text":" $this-\u003edata[$key] = $value;","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003edata\u003c/span\u003e[\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e] = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalue\u003c/span\u003e;","displayNoNewLineWarning":false,"position":6,"left":138,"right":138},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":139,"text":" $this-\u003ewarmUp($this-\u003edata);","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003ewarmUp\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003edata\u003c/span\u003e);","displayNoNewLineWarning":false,"position":7,"left":139,"right":139},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":140,"text":" list($this-\u003ekeys, $this-\u003evalues) = eval(substr(file_get_contents($this-\u003efile), 6));","html":" \u003cspan class=pl-en\u003elist\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003ekeys\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003evalues\u003c/span\u003e) = \u003cspan class=pl-en\u003eeval\u003c/span\u003e(\u003cspan class=pl-en\u003esubstr\u003c/span\u003e(\u003cspan class=pl-en\u003efile_get_contents\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003efile\u003c/span\u003e), \u003cspan class=pl-c1\u003e6\u003c/span\u003e));","displayNoNewLineWarning":false,"position":8,"left":140,"right":140},{"stylingDirective":null,"type":"DELETION","blobLineNumber":141,"text":"- }, $this, PhpArrayCache::class));","html":"- }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, PhpArrayCache::class));","displayNoNewLineWarning":false,"position":9,"left":141,"right":140},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":141,"text":"+ }, $this, PhpArrayCache::class))();","html":"+ }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, PhpArrayCache::class))\u003cspan class=\"x x-first x-last\"\u003e()\u003c/span\u003e;","displayNoNewLineWarning":false,"position":10,"left":141,"right":141},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":142,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":11,"left":142,"right":142},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":143,"text":" return true;","html":" \u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-c1\u003etrue\u003c/span\u003e;","displayNoNewLineWarning":false,"position":12,"left":143,"right":143},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":144,"text":" }","html":" }","displayNoNewLineWarning":false,"position":13,"left":144,"right":144},{"stylingDirective":null,"type":"HUNK","blobLineNumber":147,"text":"@@ -148,13 +148,13 @@ public function setMultiple($values, $ttl = null)","html":"@@ -148,13 +148,13 @@ public function setMultiple($values, $ttl = null)","displayNoNewLineWarning":false,"position":14,"left":147,"right":147},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":148,"text":" if (!\\is_array($values) \u0026\u0026 !$values instanceof \\Traversable) {","html":" \u003cspan class=pl-k\u003eif\u003c/span\u003e (!\u003cspan class=pl-en\u003e\\is_array\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalues\u003c/span\u003e) \u0026amp;\u0026amp; !\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalues\u003c/span\u003e \u003cspan class=pl-k\u003einstanceof\u003c/span\u003e \\Traversable) {","displayNoNewLineWarning":false,"position":15,"left":148,"right":148},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":149,"text":" return parent::setMultiple($values, $ttl);","html":" \u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-smi\u003eparent\u003c/span\u003e::\u003cspan class=pl-en\u003esetMultiple\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalues\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ettl\u003c/span\u003e);","displayNoNewLineWarning":false,"position":16,"left":149,"right":149},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":150,"text":" }","html":" }","displayNoNewLineWarning":false,"position":17,"left":150,"right":150},{"stylingDirective":null,"type":"DELETION","blobLineNumber":151,"text":"- \\call_user_func(\\Closure::bind(function () use ($values) {","html":"- \u003cspan class=\"pl-en x x-first x-last\"\u003e\\call_user_func\u003c/span\u003e(\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003evalues\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":18,"left":151,"right":150},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":151,"text":"+ (\\Closure::bind(function () use ($values) {","html":"+ (\\Closure::\u003cspan class=\"pl-en\"\u003ebind\u003c/span\u003e(\u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e () \u003cspan class=\"pl-k\"\u003euse\u003c/span\u003e (\u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003evalues\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":19,"left":151,"right":151},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":152,"text":" foreach ($values as $key =\u003e $value) {","html":" \u003cspan class=pl-k\u003eforeach\u003c/span\u003e (\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalues\u003c/span\u003e \u003cspan class=pl-k\u003eas\u003c/span\u003e \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e =\u0026gt; \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalue\u003c/span\u003e) {","displayNoNewLineWarning":false,"position":20,"left":152,"right":152},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":153,"text":" $this-\u003edata[$key] = $value;","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003edata\u003c/span\u003e[\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ekey\u003c/span\u003e] = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003evalue\u003c/span\u003e;","displayNoNewLineWarning":false,"position":21,"left":153,"right":153},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":154,"text":" }","html":" }","displayNoNewLineWarning":false,"position":22,"left":154,"right":154},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":155,"text":" $this-\u003ewarmUp($this-\u003edata);","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003ewarmUp\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003edata\u003c/span\u003e);","displayNoNewLineWarning":false,"position":23,"left":155,"right":155},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":156,"text":" list($this-\u003ekeys, $this-\u003evalues) = eval(substr(file_get_contents($this-\u003efile), 6));","html":" \u003cspan class=pl-en\u003elist\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003ekeys\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003evalues\u003c/span\u003e) = \u003cspan class=pl-en\u003eeval\u003c/span\u003e(\u003cspan class=pl-en\u003esubstr\u003c/span\u003e(\u003cspan class=pl-en\u003efile_get_contents\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003efile\u003c/span\u003e), \u003cspan class=pl-c1\u003e6\u003c/span\u003e));","displayNoNewLineWarning":false,"position":24,"left":156,"right":156},{"stylingDirective":null,"type":"DELETION","blobLineNumber":157,"text":"- }, $this, PhpArrayCache::class));","html":"- }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, PhpArrayCache::class));","displayNoNewLineWarning":false,"position":25,"left":157,"right":156},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":157,"text":"+ }, $this, PhpArrayCache::class))();","html":"+ }, \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003ethis\u003c/span\u003e\u003c/span\u003e, PhpArrayCache::class))\u003cspan class=\"x x-first x-last\"\u003e()\u003c/span\u003e;","displayNoNewLineWarning":false,"position":26,"left":157,"right":157},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":158,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":27,"left":158,"right":158},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":159,"text":" return true;","html":" \u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-c1\u003etrue\u003c/span\u003e;","displayNoNewLineWarning":false,"position":28,"left":159,"right":159},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":160,"text":" }","html":" }","displayNoNewLineWarning":false,"position":29,"left":160,"right":160}],"diffNumber":2,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":161,"linesChanged":8,"newTreeEntry":{"lineCount":161,"path":"Tests/Simple/PhpArrayCacheTest.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"Tests/Simple/PhpArrayCacheTest.php","mode":100644},"linesAdded":4,"linesDeleted":4,"path":"Tests/Simple/PhpArrayCacheTest.php","pathDigest":"1d3f38d2b06f7657a14ae7230f3378a49fa3a9c2ccd0fc1a366e47e7e7995ede","status":"MODIFIED","truncatedReason":null," 8000 oldOid":"2e7964c0ef6833c4d685451be3df819ef667a90b","newOid":"467a73628f042d4f7fc2fd00a81c9d2b55fa8abb","copilotChatReference":null,"deletedSha":"2e7964c0ef6833c4d685451be3df819ef667a90b","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null}],"splitViewPreference":"unified","ignoreWhitespace":false,"commentsPreference":"visible","diffLineSpacingPreference":"relaxed","useMonospaceFont":false,"pasteUrlLinkAsPlainText":false,"userNotices":[],"path":"/symfony/cache/commit/467a73628f042d4f7fc2fd00a81c9d2b55fa8abb","fileTreeExpanded":true,"headerInfo":{"additions":8,"deletions":8,"filesChanged":3,"filesChangedString":"3"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":3,"truncated":false,"byteCount":2455,"lineShownCount":58},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"_2uNd02mUukNV5zeuWuWDR6k3DAk9ENdpf8g9syrZvVgt2756HoNcTTIu794vfKiJ8gLPZm-s4R4t0mKSa_nqQ"},"/users/diffview?diff=unified":{"post":"xFNcNDPZlbefwIQbgAo_FPuQyeE6aD1ggI-YDr8ARq5bj7-6lgXKL6Zfo3pB3Fu7wvwe7Icizbldx_FyOgTH8g"},"/notifications/thread":{"post":"P8-_l5pqc-qgMtNXU8MG3p-7UkGngPIC1VAFcyn6apxkkgzxTh6QbgdatJX6YhQvCUCV40ZWuRH33QiOf2pZNA"}}},"title":"Merge branch '4.1' into 4.2 · symfony/cache@467a736","appPayload":{"helpUrl":"https://docs.github.com","findInDiffWorkerPath":"/assets-cdn/worker/find-in-diff-worker-6dcb06aa9fad.js","enabled_features":{"diff_ux_refresh_beta":false,"diff_inline_comments":true,"diff_ux_refresh_ssr_five":false,"diff_ux_refresh_ssr_ten":false}}}

Commit 467a736

Browse files
Merge branch '4.1' into 4.2
* 4.1: Fix typos in doc blocks [Debug] ignore underscore vs backslash namespaces in DebugClassLoader [TwigBridge][Form] Prevent multiple rendering of form collection prototypes [FrameworkBundle] fix describing routes with no controllers [DI] move RegisterServiceSubscribersPass before DecoratorServicePass Update ValidationListener.php [Yaml] ensures that the mb_internal_encoding is reset to its initial value [WebLink] Fixed documentation link [Security] getTargetPath of TargetPathTrait must return string or null [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument Optimize perf by replacing call_user_func with dynamic vars [Routing] fix dumping same-path routes with placeholders [Security] defer log message in guard authenticator [Validator] Added IBAN format for Vatican City State merge conflicts filter out invalid Intl values filter out invalid language values [Validator] Fixed grouped composite constraints [Form] Filter arrays out of scalar form types Fix HeaderBag::get phpdoc
2 parents 2e7964c + e9ff062 commit 467a736

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Tests/Adapter/PhpArrayAdapterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ class PhpArrayAdapterWrapper extends PhpArrayAdapter
146146

147147
public function save(CacheItemInterface $item)
148148
{
149-
\call_user_func(\Closure::bind(function () use ($item) {
149+
(\Closure::bind(function () use ($item) {
150150
$key = $item->getKey();
151151
$this->keys[$key] = $id = \count($this->values);
152152
$this->data[$key] = $this->values[$id] = $item->get();
153153
$this->warmUp($this->data);
154154
list($this->keys, $this->values) = eval(substr(file_get_contents($this->file), 6));
155-
}, $this, PhpArrayAdapter::class));
155+
}, $this, PhpArrayAdapter::class))();
156156

157157
return true;
158158
}

Tests/CacheItemTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ public function testTag()
6262
$this->assertSame($item, $item->tag('foo'));
6363
$this->assertSame($item, $item->tag(array('bar', 'baz')));
6464

65-
\call_user_func(\Closure::bind(function () use ($item) {
65+
(\Closure::bind(function () use ($ 8000 item) {
6666
$this->assertSame(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), $item->newMetadata[CacheItem::METADATA_TAGS]);
67-
}, $this, CacheItem::class));
67+
}, $this, CacheItem::class))();
6868
}
6969

7070
/**

Tests/Simple/PhpArrayCacheTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ class PhpArrayCacheWrapper extends PhpArrayCache
134134

135135
public function set($key, $value, $ttl = null)
136136
{
137-
\call_user_func(\Closure::bind(function () use ($key, $value) {
137+
(\Closure::bind(function () use ($key, $value) {
138138
$this->data[$key] = $value;
139139
$this->warmUp($this->data);
140140
list($this->keys, $this->values) = eval(substr(file_get_contents($this->file), 6));
141-
}, $this, PhpArrayCache::class));
141+
}, $this, PhpArrayCache::class))();
142142

143143
return true;
144144
}
@@ -148,13 +148,13 @@ public function setMultiple($values, $ttl = null)
148148
if (!\is_array($values) && !$values instanceof \Traversable) {
149149
return parent::setMultiple($values, $ttl);
150150
}
151-
\call_user_func(\Closure::bind(function () use ($values) {
151+
(\Closure::bind(function () use ($values) {
152152
foreach ($values as $key => $value) {
153153
$this->data[$key] = $value;
154154
}
155155
$this->warmUp($this->data);
156156
list($this->keys, $this->values) = eval(substr(file_get_contents($this->file), 6));
157-
}, $this, PhpArrayCache::class));
157+
}, $this, PhpArrayCache::class))();
158158

159159
return true;
160160
}

0 commit comments

Comments
 (0)
0