NTR - Update dependencies

Author: mitelg

app/config/sculpin_services.yml

@@ -12,7 +12,6 @@ services:
     shopware_devdocs.twig_extension:
         class: Shopware\Devdocs\TwigExtension
         arguments:
-            - @sculpin_theme.theme_twig_extension
             - %kernel.environment%
         tags:
             - { name: twig.extension }

app/src/AlgoliaBundle/AlgoliaIndexListener.php

@@ -20,9 +20,9 @@ class AlgoliaIndexListener implements EventSubscriberInterface
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Sculpin::EVENT_AFTER_RUN => 'afterRun',
-        );
+        ];
     }
 
     /**
@@ -32,18 +32,18 @@ public static function getSubscribedEvents()
     public function __construct(Client $client, $indexName)
     {
         $this->index = $client->initIndex($indexName);
-        $this->index->setSettings(array(
-            "attributesToIndex" => array("title", "tags", "unordered(body)"),
-            'attributesForFaceting' => array('tags')
-        ));
+        $this->index->setSettings([
+            'attributesToIndex' => ['title', 'tags', 'unordered(body)'],
+            'attributesForFaceting' => ['tags']
+        ]);
     }
 
     /**
-     * @param \Sculpin\Core\Event\SourceSetEvent $event
+     * @param SourceSetEvent $event
      */
     public function afterRun(SourceSetEvent $event)
     {
-        $documents = array();
+        $documents = [];
         /** @var AbstractSource $item */
         foreach ($event->allSources() as $item) {
             if ($item->data()->get('indexed')) {
@@ -65,15 +65,15 @@ public function afterRun(SourceSetEvent $event)
      */
     private function parseSource(AbstractSource $source)
     {
-        $document = array(
+        $document = [
             'objectID' => sha1($source->sourceId()),
             'title' => $source->data()->get('title'),
             'body'  => strip_tags($source->content()),
             'url'   => rtrim($source->permalink()->relativeUrlPath(), '/').'/',
             'date' => $source->data()->get('calculated_date'),
-        );
+        ];
 
-        $tags = (is_array($source->data()->get('tags'))) ? $source->data()->get('tags') : array();
+        $tags = is_array($source->data()->get('tags')) ? $source->data()->get('tags') : [];
         if ($tags) {
             $document['tags'] = $tags;
         }

app/src/AlgoliaBundle/Resources/config/services.xml

@@ -10,9 +10,9 @@
         </service>
 
         <service id="shopware_search.algolia.listener" class="Shopware\Devdocs\AlgoliaBundle\AlgoliaIndexListener">
-            <argument type="service" id="shopware_search.algolia.client" />
+            <argument type="service" id="shopware_search.algolia.client"/>
             <argument>%algolia.index_name%</argument>
-            <tag name="kernel.event_subscriber" />
+            <tag name="kernel.event_subscriber"/>
         </service>
     </services>
 

app/src/AnchorListener.php

@@ -1,6 +1,7 @@
 <?php
 namespace Shopware\Devdocs;
 
+use IvoPetkov\HTML5DOMDocument;
 use Sculpin\Core\Event\SourceSetEvent;
 use Sculpin\Core\Sculpin;
 use Sculpin\Core\Source\SourceInterface;
@@ -11,16 +12,16 @@ class AnchorListener implements EventSubscriberInterface
     /**
      * @var string[]
      */
-    private $usedAnchors = array();
+    private $usedAnchors = [];
 
     /**
      * {@inheritDoc}
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Sculpin::EVENT_AFTER_FORMAT => 'afterFormat',
-        );
+        ];
     }
 
     public function afterFormat(SourceSetEvent $event)
@@ -63,7 +64,7 @@ private function formatSource(SourceInterface $source)
             return;
         }
 
-        $dom = new \IvoPetkov\HTML5DOMDocument();
+        $dom = new HTML5DOMDocument();
         $dom->loadHTML($content);
         if (!$dom) {
             return;

app/src/GitHistoryBundle/DependencyInjection/SculpinGitHistoryExtension.php

@@ -3,7 +3,7 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class SculpinGitHistoryExtension extends Extension
@@ -13,7 +13,7 @@ class SculpinGitHistoryExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
     }
 }

app/src/SearchIndexListener.php

@@ -18,9 +18,9 @@ class SearchIndexListener implements EventSubscriberInterface
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Sculpin::EVENT_AFTER_RUN => 'afterRun',
-        );
+        ];
     }
 
     /**
@@ -32,11 +32,11 @@ public function __construct($outputDir)
     }
 
     /**
-     * @param \Sculpin\Core\Event\SourceSetEvent $event
+     * @param SourceSetEvent $event
      */
     public function afterRun(SourceSetEvent $event)
     {
-        $documents = array();
+        $documents = [];
         /** @var AbstractSource $item */
         foreach ($event->allSources() as $item) {
             if ($item->data()->get('indexed')) {
@@ -60,14 +60,14 @@ public function afterRun(SourceSetEvent $event)
      */
     private function parseSource(AbstractSource $source)
     {
-        $tags = (is_array($source->data()->get('tags'))) ? $source->data()->get('tags') : array();
+        $tags = is_array($source->data()->get('tags')) ? $source->data()->get('tags') : [];
 
-        $document = array(
+        $document = [
             'title' => $source->data()->get('title'),
             'body'  => strip_tags($source->content()),
             'tags'  => implode(', ', $tags),
             'url'   => rtrim($source->permalink()->relativeUrlPath(), '/').'/',
-        );
+        ];
 
         return $document;
     }

app/src/TwigExtension.php

@@ -2,41 +2,23 @@
 
 namespace Shopware\Devdocs;
 
-use Sculpin\Bundle\ThemeBundle\ThemeTwigExtension;
-
 class TwigExtension extends \Twig_Extension
 {
     /**
      * @var string
      */
     private $environment;
 
-    /**
-     * @var ThemeTwigExtension
-     */
-    private $twigThemeExtension;
-
-    public function __construct(ThemeTwigExtension $twigThemeExtension, $environment)
-    {
-        $this->twigThemeExtension = $twigThemeExtension;
-        $this->environment        = $environment;
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
+    public function __construct($environment)
     {
-        return __CLASS__;
+        $this->environment = $environment;
     }
 
     public function getFunctions()
     {
-        return array(
-            'versioned' => new \Twig_Function_Method($this, 'versioned'),
-        );
+        return [
+            new \Twig_SimpleFunction('versioned', [$this, 'versioned']),
+        ];
     }
 
     /**
@@ -45,14 +27,14 @@ public function getFunctions()
      */
     public function versioned($resource)
     {
-        $parts  = pathinfo($resource);
-        $version = ($this->environment === 'prod') ? '.'.time() : '';
+        $parts = pathinfo($resource);
+        $version = ($this->environment === 'prod') ? '.' . time() : '';
 
         return $parts['dirname']
-        .'/'
-        .$parts['filename']
-        .$version
-        .'.'
-        .$parts['extension'];
+            . '/'
+            . $parts['filename']
+            . $version
+            . '.'
+            . $parts['extension'];
     }
 }

composer.json

@@ -7,7 +7,12 @@
         "mavimo/sculpin-redirect-bundle": "@dev",
         "webuni/commonmark-table-extension": "^0.9.0",
         "janbuecker/sculpin-meta-navigation-bundle": "^0.4",
-        "ivopetkov/html5-dom-document-php": "^1.1.0"
+        "ivopetkov/html5-dom-document-php": "^1.1.0",
+        "symfony/config": "2.8.50",
+        "symfony/dependency-injection":  "2.8.50",
+        "symfony/event-dispatcher": "2.8.50",
+        "symfony/http-kernel": "2.8.51",
+        "twig/twig": "1.37.1"
     },
     "autoload": {
         "psr-4": {