Merge pull request #14 from ComiR/3.x

!!! TASK: Upgrade for Neos 3.0

Classes/BackendFactory.php

@@ -0,0 +1,64 @@
+<?php
+namespace Networkteam\Neos\Shariff;
+
+/***************************************************************
+ *  (c) 2015 networkteam GmbH - all rights reserved
+ ***************************************************************/
+
+use Heise\Shariff\Backend;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+
+class BackendFactory
+{
+    /**
+     * @var array
+     */
+    protected static $supportedServices = [
+        'AddThis',
+        'Facebook',
+        'Flattr',
+        'GooglePlus',
+        'LinkedIn',
+        'Pinterest',
+        'Reddit',
+        'StumbleUpon',
+        'Xing',
+    ];
+
+    /**
+     * @Flow\InjectConfiguration(path="options")
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * @Flow\InjectConfiguration(path="http.baseUri", package="Neos.Flow")
+     * @var string
+     */
+    protected $baseUri;
+
+    /**
+     * Auto-detect the domain (if not set) and restrict services to available backends
+     */
+    public function initializeObject()
+    {
+        if (!isset($this->options['domains'])) {
+            $request = Request::createFromEnvironment();
+            if ((string)$this->baseUri !== '') {
+                $request->setBaseUri(new Uri($this->baseUri));
+            }
+            $this->options['domains'] = [$request->getBaseUri()->getHost()];
+        }
+        $this->options['services'] = array_intersect($this->options['services'], static::$supportedServices);
+    }
+
+    /**
+     * @return Backend
+     */
+    public function create()
+    {
+        return new Backend($this->options);
+    }
+}

Classes/Controller/ShariffController.php

@@ -0,0 +1,31 @@
+<?php
+namespace Networkteam\Neos\Shariff\Controller;
+
+/***************************************************************
+ *  (c) 2015 networkteam GmbH - all rights reserved
+ ***************************************************************/
+
+use Heise\Shariff\Backend;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Mvc\Controller\ActionController;
+
+class ShariffController extends ActionController
+{
+    /**
+     * @var Backend
+     * @Flow\Inject
+     */
+    protected $shariff;
+
+    /**
+     * @param string $url
+     *
+     * @return string
+     */
+    public function countsAction($url = null)
+    {
+        $this->response->getHeaders()->set('Content-Type', 'application/json');
+
+        return json_encode($this->shariff->get($url));
+    }
+}

Configuration/NodeTypes.Shariff.yaml

@@ -1,6 +1,6 @@
 'Networkteam.Neos.Shariff:Shariff':
   superTypes:
-    'TYPO3.Neos:Content': true
+    'Neos.Neos:Content': true
   ui:
     label: 'Social Plugins'
     icon: icon-ellipsis-horizontal

Configuration/Policy.yaml

@@ -1,10 +1,9 @@
-
 privilegeTargets:
-  TYPO3\Flow\Security\Authorization\Privilege\Method\MethodPrivilege:
+  Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilege:
     Networkteam_Neos_Shariff_Backend:
       matcher: method(Networkteam\Neos\Shariff\Controller\ShariffController->countsAction())
 roles:
-  'TYPO3.Flow:Everybody':
+  'Neos.Flow:Everybody':
     privileges:
       -
         privilegeTarget: Networkteam_Neos_Shariff_Backend

Configuration/Routes.yaml

@@ -1,9 +1,9 @@
 -
-  name:  'shariff'
-  uriPattern: 'counts'
+  name:  'Networkteam.Neos.Shariff'
+  uriPattern: 'shariff'
   defaults:
     '@package':    'Networkteam.Neos.Shariff'
     '@controller': 'Shariff'
     '@action':     'counts'
     '@format':     'json'
-  appendExceedingArguments: true
+  appendExceedingArguments: true

Configuration/Settings.yaml

@@ -1,13 +1,16 @@
-TYPO3:
+Neos:
   Flow:
+    mvc:
+      routes:
+        'Networkteam.Neos.Shariff':
+          position: 'before Neos.Neos'
     reflection:
       ignoredTags:
-        unstable: TRUE
-
+        unstable: true
   Neos:
-    typoScript:
+    fusion:
       autoInclude:
-        'Networkteam.Neos.Shariff': TRUE
+        Networkteam.Neos.Shariff: true
 
 Networkteam:
   Neos:
@@ -17,16 +20,26 @@ Networkteam:
         orientation: horizontal
         language: en
       options:
-        domain: ~
+        domain: null
         cache:
           ttl: 3600
         services:
+#          - AddThis
+#          - Diaspora
 #          - Facebook
+#          - Flattr
 #          - GooglePlus
-#          - Twitter
+#          - Info
 #          - LinkedIn
+#          - Mail
+#          - Pinterest
+#          - Qzone
 #          - Reddit
 #          - StumbleUpon
-#          - Flattr
-#          - Pinterest
+#          - tencent-weibo
+#          - Threema
+#          - tumblr
+#          - Twitter
+#          - weibo
+#          - Whatsapp
 #          - Xing