Introduce private method to correctly support strict types

lbajsarowicz · lbajsarowicz · commit ab2be56ec292 · 2020-05-08T16:56:52.000+02:00
diff --git a/app/code/Magento/Cms/Block/BlockByIdentifier.php b/app/code/Magento/Cms/Block/BlockByIdentifier.php
@@ -19,8 +19,6 @@
 
 /**
  * This class is replacement of \Magento\Cms\Block\Block, that accepts only `string` identifier of CMS Block
- *
- * @method getIdentifier(): int Returns the value of `identifier` injected in `<block>` definition
  */
 class BlockByIdentifier extends AbstractBlock implements IdentityInterface
 {
@@ -80,6 +78,16 @@ protected function _toHtml(): string
         }
     }
 
+    /**
+     * Returns the value of `identifier` injected in `<block>` definition
+     *
+     * @return string|null
+     */
+    private function getIdentifier(): ?string
+    {
+        return $this->getdata('identifier') ?: null;
+    }
+
     /**
      * Filters the Content
      *

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	* This class is replacement of \Magento\Cms\Block\Block, that accepts only `string` identifier of CMS Block
`22`		`- *`
`23`		- * @method getIdentifier(): int Returns the value of `identifier` injected in `<block>` definition
`24`	`22`	`*/`
`25`	`23`	`class BlockByIdentifier extends AbstractBlock implements IdentityInterface`
`26`	`24`	`{`
`@@ -80,6 +78,16 @@ protected function _toHtml(): string`
`80`	`78`	`}`
`81`	`79`	`}`
`82`	`80`
	`81`	`+ /**`
	`82`	+ * Returns the value of `identifier` injected in `<block>` definition
	`83`	`+ *`
	`84`	`+ * @return string\|null`
	`85`	`+ */`
	`86`	`+ private function getIdentifier(): ?string`
	`87`	`+ {`
	`88`	`+ return $this->getdata('identifier') ?: null;`
	`89`	`+ }`
	`90`	`+`
`83`	`91`	`/**`
`84`	`92`	`* Filters the Content`
`85`	`93`	`*`