-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BUGFIX] version check breaks with Shopware 5.6 -> thx @jonakieling -…
… refs #4
- Loading branch information
Showing
3 changed files
with
207 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,194 +1,194 @@ | ||
| <?php | ||
| namespace Port1Typo3Connector\Components; | ||
|
|
||
| use Shopware\Components\Api\Manager; | ||
| use Shopware\Components\Api\Resource\Shop; | ||
| use Shopware\Components\DependencyInjection\Container; | ||
| use Shopware\Components\Routing\Context; | ||
| use Shopware\Components\Routing\Router; | ||
| use Shopware\Models\Shop\DetachedShop; | ||
|
|
||
| /** | ||
| * Class ApiUrlDecorator | ||
| * | ||
| * @package Portrino\Typo3Connector\Components | ||
| */ | ||
| abstract class ApiUrlDecorator | ||
| { | ||
|
|
||
| /** | ||
| * @var \Shopware_Components_Config | ||
| */ | ||
| protected $config; | ||
|
|
||
| /** | ||
| * @var Container | ||
| */ | ||
| protected $container; | ||
|
|
||
| /** | ||
| * @var \Shopware_Controllers_Api_Articles | ||
| */ | ||
| protected $controller; | ||
|
|
||
| /** | ||
| * @var \Enlight_Controller_Request_Request | ||
| */ | ||
| protected $request; | ||
|
|
||
| /** | ||
| * @var \Enlight_View_Default | ||
| */ | ||
| protected $view; | ||
|
|
||
| /** | ||
| * @var Shop | ||
| */ | ||
| protected $shopResource; | ||
|
|
||
| /** | ||
| * @var DetachedShop | ||
| */ | ||
| protected $shop; | ||
|
|
||
| /** | ||
| * @var Context | ||
| */ | ||
| protected $context; | ||
|
|
||
| /** | ||
| * @var bool | ||
| */ | ||
| protected $isPxShopwareRequest = false; | ||
|
|
||
| /** | ||
| * ApiTokenDecorator constructor. | ||
| * | ||
| * @param \Enlight_Controller_Action $controller | ||
| * @param Container $container | ||
| * @throws \Exception | ||
| */ | ||
| public function __construct(\Enlight_Controller_Action $controller, Container $container) | ||
| { | ||
| $this->container = $container; | ||
| $this->controller = $controller; | ||
|
|
||
| $this->config = $this->container->get('config'); | ||
| $this->request = $this->controller->Request(); | ||
| $this->view = $this->controller->View(); | ||
| $this->shopResource = Manager::getResource('shop'); | ||
| $this->isPxShopwareRequest = ($this->request->getParam('px_shopware') != null) ? (bool)$this->request->getParam('px_shopware') : false; | ||
|
|
||
| if ($this->isPxShopwareRequest) { | ||
| $language = ($this->request->getParam('language') != null) ? (int)$this->request->getParam('language') : false; | ||
| if ($language !== false) { | ||
| // we cannot use this query, because of bug described here: https://issues.shopware.com/#/issues/SW-15388 | ||
| // $this->shop = $this->shopResource->getRepository()->queryBy(array('active' => TRUE, 'locale' => $language))->getOneOrNullResult(); | ||
| $this->shop = $this->shopResource->getRepository()->queryBy([ | ||
| 'active' => true, | ||
| 'id' => $language | ||
| ])->getOneOrNullResult(); | ||
| } else { | ||
| $this->shop = $this->shopResource->getRepository()->getActiveDefault(); | ||
| } | ||
| $router = $this->controller->Front()->Router(); | ||
|
|
||
| if ($router instanceof Router) { | ||
| if (\Shopware::VERSION !== '___VERSION___') { | ||
| $currentVersion = \Shopware::VERSION; | ||
| } else { | ||
| // if '___VERSION___' is given, it seems to be a composer installation | ||
| // composer is available from 5.4 on and there we have the container 'shopware.release' | ||
| /** @var \Shopware\Components\ShopwareReleaseStruct $shopwareRelease */ | ||
| $shopwareRelease = $this->container->get('shopware.release'); | ||
| $currentVersion = $shopwareRelease->getVersion(); | ||
| } | ||
|
|
||
| $context = $router->getContext(); | ||
| $newContext = Context::createFromShop($this->shop, $this->config); | ||
| // Reuse the host | ||
| if ($newContext->getHost() === null) { | ||
| $newContext->setHost($context->getHost()); | ||
| $newContext->setBaseUrl($context->getBaseUrl()); | ||
| $newContext->setSecure($context->isSecure()); | ||
| } | ||
| if (version_compare($currentVersion, '5.4.0', '<')) { | ||
| // the following methods are removed in Shopware 5.4 | ||
| $newContext->setAlwaysSecure($this->shop->getAlwaysSecure()); | ||
| $newContext->setSecureHost($this->shop->getSecureHost()); | ||
| $newContext->setSecureBaseUrl($this->shop->getSecureBaseUrl()); | ||
| } | ||
| // Reuse the global params like controller and action | ||
| $globalParams = $context->getGlobalParams(); | ||
| $newContext->setGlobalParams($globalParams); | ||
| // Check baseUrl | ||
| $newContext->setBaseUrl( | ||
| $newContext->getBaseUrl() ? $newContext->getBaseUrl() : $this->shop->getBasePath() | ||
| ); | ||
| $router->setContext($newContext); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param \Enlight_Event_EventArgs $args | ||
| */ | ||
| public function addUrl() | ||
| { | ||
| if ($this->isPxShopwareRequest) { | ||
| try { | ||
| $dataBefore = $this->controller->View()->getAssign('data'); | ||
|
|
||
| $data = $this->controller->View()->getAssign('data'); | ||
| $action = $this->controller->Request()->getActionName(); | ||
|
|
||
| if ($action === 'get') { | ||
| if (is_array($data) && isset($data['id'])) { | ||
| $url = $this->getItemUrl($data['id']); | ||
| $data = array_merge_recursive( | ||
| $this->controller->View()->getAssign('data'), | ||
| ['pxShopwareUrl' => $url] | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| if ($action === 'index') { | ||
| if (is_array($data)) { | ||
| // add article urls to each article of the list | ||
| $items = $this->controller->View()->getAssign('data'); | ||
| foreach ($items as $key => $item) { | ||
| $item['pxShopwareUrl'] = $this->getItemUrl($item['id']); | ||
| $items[$key] = $item; | ||
| } | ||
| $data = $items; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| $this->controller->View()->clearAssign('data'); | ||
| $this->controller->View()->assign('data', $data); | ||
|
|
||
| /** | ||
| * we have to call postDispatch again to force Zend_Json::encode call | ||
| */ | ||
| $this->controller->postDispatch(); | ||
|
|
||
| } catch (\Exception $exception) { | ||
| /** | ||
| * in case of an error we should reset data and render view again with data before | ||
| */ | ||
| $this->controller->View()->clearAssign('data'); | ||
| $this->controller->View()->assign('data', $dataBefore); | ||
| $this->controller->postDispatch(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param int $itemId | ||
| * @param string $orderNumber | ||
| * | ||
| * @return string | ||
| */ | ||
| abstract protected function getItemUrl($itemId, $orderNumber = null); | ||
| } | ||
| <?php | ||
| namespace Port1Typo3Connector\Components; | ||
|
|
||
| use Shopware\Components\Api\Manager; | ||
| use Shopware\Components\Api\Resource\Shop; | ||
| use Shopware\Components\DependencyInjection\Container; | ||
| use Shopware\Components\Routing\Context; | ||
| use Shopware\Components\Routing\Router; | ||
| use Shopware\Models\Shop\DetachedShop; | ||
|
|
||
| /** | ||
| * Class ApiUrlDecorator | ||
| * | ||
| * @package Portrino\Typo3Connector\Components | ||
| */ | ||
| abstract class ApiUrlDecorator | ||
| { | ||
|
|
||
| /** | ||
| * @var \Shopware_Components_Config | ||
| */ | ||
| protected $config; | ||
|
|
||
| /** | ||
| * @var Container | ||
| */ | ||
| protected $container; | ||
|
|
||
| /** | ||
| * @var \Shopware_Controllers_Api_Articles | ||
| */ | ||
| protected $controller; | ||
|
|
||
| /** | ||
| * @var \Enlight_Controller_Request_Request | ||
| */ | ||
| protected $request; | ||
|
|
||
| /** | ||
| * @var \Enlight_View_Default | ||
| */ | ||
| protected $view; | ||
|
|
||
| /** | ||
| * @var Shop | ||
| */ | ||
| protected $shopResource; | ||
|
|
||
| /** | ||
| * @var DetachedShop | ||
| */ | ||
| protected $shop; | ||
|
|
||
| /** | ||
| * @var Context | ||
| */ | ||
| protected $context; | ||
|
|
||
| /** | ||
| * @var bool | ||
| */ | ||
| protected $isPxShopwareRequest = false; | ||
|
|
||
| /** | ||
| * ApiTokenDecorator constructor. | ||
| * | ||
| * @param \Enlight_Controller_Action $controller | ||
| * @param Container $container | ||
| * @throws \Exception | ||
| */ | ||
| public function __construct(\Enlight_Controller_Action $controller, Container $container) | ||
| { | ||
| $this->container = $container; | ||
| $this->controller = $controller; | ||
|
|
||
| $this->config = $this->container->get('config'); | ||
| $this->request = $this->controller->Request(); | ||
| $this->view = $this->controller->View(); | ||
| $this->shopResource = Manager::getResource('shop'); | ||
| $this->isPxShopwareRequest = ($this->request->getParam('px_shopware') != null) ? (bool)$this->request->getParam('px_shopware') : false; | ||
|
|
||
| if ($this->isPxShopwareRequest) { | ||
| $language = ($this->request->getParam('language') != null) ? (int)$this->request->getParam('language') : false; | ||
| if ($language !== false) { | ||
| // we cannot use this query, because of bug described here: https://issues.shopware.com/#/issues/SW-15388 | ||
| // $this->shop = $this->shopResource->getRepository()->queryBy(array('active' => TRUE, 'locale' => $language))->getOneOrNullResult(); | ||
| $this->shop = $this->shopResource->getRepository()->queryBy([ | ||
| 'active' => true, | ||
| 'id' => $language | ||
| ])->getOneOrNullResult(); | ||
| } else { | ||
| $this->shop = $this->shopResource->getRepository()->getActiveDefault(); | ||
| } | ||
| $router = $this->controller->Front()->Router(); | ||
|
|
||
| if ($router instanceof Router) { | ||
| if (defined('\Shopware::VERSION') && \Shopware::VERSION !== '___VERSION___') { | ||
| $currentVersion = \Shopware::VERSION; | ||
| } else { | ||
| // if '___VERSION___' is given, it seems to be a composer installation | ||
| // composer is available from 5.4 on and there we have the container 'shopware.release' | ||
| /** @var \Shopware\Components\ShopwareReleaseStruct $shopwareRelease */ | ||
| $shopwareRelease = $this->container->get('shopware.release'); | ||
| $currentVersion = $shopwareRelease->getVersion(); | ||
| } | ||
|
|
||
| $context = $router->getContext(); | ||
| $newContext = Context::createFromShop($this->shop, $this->config); | ||
| // Reuse the host | ||
| if ($newContext->getHost() === null) { | ||
| $newContext->setHost($context->getHost()); | ||
| $newContext->setBaseUrl($context->getBaseUrl()); | ||
| $newContext->setSecure($context->isSecure()); | ||
| } | ||
| if (version_compare($currentVersion, '5.4.0', '<')) { | ||
| // the following methods are removed in Shopware 5.4 | ||
| $newContext->setAlwaysSecure($this->shop->getAlwaysSecure()); | ||
| $newContext->setSecureHost($this->shop->getSecureHost()); | ||
| $newContext->setSecureBaseUrl($this->shop->getSecureBaseUrl()); | ||
| } | ||
| // Reuse the global params like controller and action | ||
| $globalParams = $context->getGlobalParams(); | ||
| $newContext->setGlobalParams($globalParams); | ||
| // Check baseUrl | ||
| $newContext->setBaseUrl( | ||
| $newContext->getBaseUrl() ? $newContext->getBaseUrl() : $this->shop->getBasePath() | ||
| ); | ||
| $router->setContext($newContext); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param \Enlight_Event_EventArgs $args | ||
| */ | ||
| public function addUrl() | ||
| { | ||
| if ($this->isPxShopwareRequest) { | ||
| try { | ||
| $dataBefore = $this->controller->View()->getAssign('data'); | ||
|
|
||
| $data = $this->controller->View()->getAssign('data'); | ||
| $action = $this->controller->Request()->getActionName(); | ||
|
|
||
| if ($action === 'get') { | ||
| if (is_array($data) && isset($data['id'])) { | ||
| $url = $this->getItemUrl($data['id']); | ||
| $data = array_merge_recursive( | ||
| $this->controller->View()->getAssign('data'), | ||
| ['pxShopwareUrl' => $url] | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| if ($action === 'index') { | ||
| if (is_array($data)) { | ||
| // add article urls to each article of the list | ||
| $items = $this->controller->View()->getAssign('data'); | ||
| foreach ($items as $key => $item) { | ||
| $item['pxShopwareUrl'] = $this->getItemUrl($item['id']); | ||
| $items[$key] = $item; | ||
| } | ||
| $data = $items; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| $this->controller->View()->clearAssign('data'); | ||
| $this->controller->View()->assign('data', $data); | ||
|
|
||
| /** | ||
| * we have to call postDispatch again to force Zend_Json::encode call | ||
| */ | ||
| $this->controller->postDispatch(); | ||
|
|
||
| } catch (\Exception $exception) { | ||
| /** | ||
| * in case of an error we should reset data and render view again with data before | ||
| */ | ||
| $this->controller->View()->clearAssign('data'); | ||
| $this->controller->View()->assign('data', $dataBefore); | ||
| $this->controller->postDispatch(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param int $itemId | ||
| * @param string $orderNumber | ||
| * | ||
| * @return string | ||
| */ | ||
| abstract protected function getItemUrl($itemId, $orderNumber = null); | ||
| } |
Oops, something went wrong.