Merge pull request #9 from dachcom-digital/pimcore_x

remove deprecations
dachcom-digital · Oct 14, 2021 · ec94f37 · ec94f37
2 parents 9858388 + 5dfd694
commit ec94f37
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This bundle requires the `spatie/schema-org` package.
 [![Software License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg?style=flat-square)](LICENSE.md)
 [![Latest Release](https://img.shields.io/packagist/v/dachcom-digital/schema.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/schema)
 [![Tests](https://img.shields.io/github/workflow/status/dachcom-digital/pimcore-schema/Codeception/master?style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-schema/actions?query=workflow%3ACodeception+branch%3Amaster)
-[![PhpStan](https://img.shields.io/github/workflow/status/dachcom-digital/pimcore-schema/PHP%20Stan/master?style=flat-square&logo=github&label=phpstan%20level%202)](https://github.com/dachcom-digital/pimcore-schema/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
+[![PhpStan](https://img.shields.io/github/workflow/status/dachcom-digital/pimcore-schema/PHP%20Stan/master?style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-schema/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
 
 ### Release Plan
 

diff --git a/composer.json b/composer.json
@@ -29,9 +29,6 @@
             "bundles": [
                 "SchemaBundle\\SchemaBundle"
             ]
-        },
-        "branch-alias": {
-            "dev-master": "2.0-dev"
         }
     },
     "require": {

diff --git a/src/SchemaBundle/Processor/SchemaRequestProcessor.php b/src/SchemaBundle/Processor/SchemaRequestProcessor.php
@@ -44,10 +44,7 @@ public function process(Request $request): void
      */
     protected function appendHeadMeta(Graph $graph, array $schemaBlocks): void
     {
-        // spatie/schema-org changed getProperties to getNodes after 2.14
-        $nodes = method_exists($graph, 'getProperties')
-            ? $graph->getProperties()
-            : $graph->getNodes();
+        $nodes = $graph->getNodes();
 
         if (count($nodes) > 0) {
             $this->headMeta->addRaw($graph->toScript());

diff --git a/src/SchemaBundle/Seo/Middleware/SchemaGraphAdapter.php b/src/SchemaBundle/Seo/Middleware/SchemaGraphAdapter.php
@@ -22,10 +22,7 @@ public function getTaskArguments(): array
 
     public function onFinish(SeoMetaDataInterface $seoMetadata): void
     {
-        // spatie/schema-org changed getProperties to getNodes after 2.14
-        $nodes = method_exists($this->graph, 'getProperties')
-            ? $this->graph->getProperties()
-            : $this->graph->getNodes();
+        $nodes = $this->graph->getNodes();
 
         if (count($nodes) > 0) {
             $seoMetadata->addSchema($this->graph->toArray());