Merge pull request #143 from Nosto/hotfix/release-2.0.2

Fix Array Attribution in Frontend Controller

Bootstrap.php

@@ -55,7 +55,7 @@
 class Shopware_Plugins_Frontend_NostoTagging_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
     const PLATFORM_NAME = 'shopware';
-    const PLUGIN_VERSION = '2.0.1';
+    const PLUGIN_VERSION = '2.0.2';
     const MENU_PARENT_ID = 23;  // Configuration
     const NEW_ENTITY_MANAGER_VERSION = '5.0.0';
     const NEW_ATTRIBUTE_MANAGER_VERSION = '5.2.0';

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.2]
+- Fix PHP backwards compatibility
+
 ## [2.0.1]
 - Fix builder deleting composer autoloader
 
@@ -151,7 +154,8 @@ recommendations
 - Initial beta-release
 
 
-[unreleased]: https://github.com/nosto/nosto-shopware-plugin/compare/2.0.1...develop
+[unreleased]: https://github.com/nosto/nosto-shopware-plugin/compare/2.0.2...develop
+[2.0.2]: https://github.com/nosto/nosto-shopware-plugin/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/nosto/nosto-shopware-plugin/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/nosto/nosto-shopware-plugin/compare/1.2.6...2.0.0
 [1.2.6]: https://github.com/nosto/nosto-shopware-plugin/compare/1.2.5...1.2.6

Controllers/frontend/NostoTagging.php

@@ -107,9 +107,7 @@ public function oauthAction()
             'module' => 'backend',
             'controller' => 'index',
             'action' => 'index',
-            'openNosto' => $shop->getId(),
-            'messageType' => '',
-            'messageCode' => ''
+            'openNosto' => $shop->getId()
         );
 
         if (!is_null($code)) {
@@ -164,7 +162,7 @@ public function oauthAction()
             Shopware()->Plugins()->Frontend()->NostoTagging()->getLogger()->error($logMessage);
             $redirectParams['messageType'] = Nosto::TYPE_ERROR;
             $redirectParams['messageCode'] = Nosto::CODE_ACCOUNT_CONNECT;
-            $redirectParams[] = ['messageText' => $errorDescription];
+            $redirectParams['messageText'] = $errorDescription;
             $this->redirect($redirectParams, array('code' => 302));
         } else {
             throw new Zend_Controller_Action_Exception('Not Found', 404);
@@ -280,10 +278,12 @@ private function getAuthenticatedToken(Shopware\Models\Shop\DetachedShop $shop,
         $oauthClient = new AuthorizationCode($meta);
         $token = $oauthClient->authenticate($code);
 
-        if (empty($token->getAccessToken())) {
+        $accessToken = $token->getAccessToken();
+        if (empty($accessToken)) {
             throw new NostoException('No access token found when trying to sync account from Nosto');
         }
-        if (empty($token->getMerchantName())) {
+        $merchantName = $token->getMerchantName();
+        if (empty($merchantName)) {
             throw new NostoException('No merchant name found when trying to sync account from Nosto');
         }
         return $token;

build.xml

@@ -84,8 +84,11 @@
         <delete file="${buildsrc}/${vendordir}/nosto/php-sdk/package.json"/>
         <delete file="${buildsrc}/${vendordir}/nosto/php-sdk/composer.json"/>
         <delete file="${buildsrc}/${vendordir}/nosto/php-sdk/src/.env.example"/>
+        <delete file="${buildsrc}/${vendordir}/nosto/php-sdk/phan.php"/>
         <delete file="${buildsrc}/composer.json"/>
         <delete file="${buildsrc}/composer.lock"/>
+        <delete file="${buildsrc}/Dockerfile"/>
+        <delete file="${buildsrc}/Jenkinsfile"/>
     </target>
 
     <target name="updatedependencies">

composer.json

@@ -4,7 +4,7 @@
   "license": [
     "BSD-3-Clause"
   ],
-  "version": "2.0.1",
+  "version": "2.0.2",
   "require": {
     "php": ">=5.5.0",
     "nosto/php-sdk": "3.3.1"