From 7ebc1c7c1561aa4cf92414e11445d7415da7d41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20B=C3=B6hmer?= <daniel.boehmer@jtl-software.com>
Date: Tue, 14 Jul 2015 14:17:50 +0200
Subject: [PATCH] minor refactoring
---
src/{ => Authentication}/TokenLoader.php | 2 +-
src/{ => Checksum}/ChecksumLoader.php | 2 +-
src/Connector.php | 63 ++++++++++--------------
src/{ => Mapper}/PrimaryKeyMapper.php | 2 +-
4 files changed, 30 insertions(+), 39 deletions(-)
rename src/{ => Authentication}/TokenLoader.php (87%)
rename src/{ => Checksum}/ChecksumLoader.php (95%)
rename src/{ => Mapper}/PrimaryKeyMapper.php (97%)
diff --git a/src/TokenLoader.php b/src/Authentication/TokenLoader.php
similarity index 87%
rename from src/TokenLoader.php
rename to src/Authentication/TokenLoader.php
index 1414572..2030af7 100644
--- a/src/TokenLoader.php
+++ b/src/Authentication/TokenLoader.php
@@ -1,6 +1,6 @@
<?php
-namespace jtl\Connector\Example;
+namespace jtl\Connector\Example\Authentication;
use jtl\Connector\Authentication\ITokenLoader;
diff --git a/src/ChecksumLoader.php b/src/Checksum/ChecksumLoader.php
similarity index 95%
rename from src/ChecksumLoader.php
rename to src/Checksum/ChecksumLoader.php
index 1cee479..5e1f4a0 100644
--- a/src/ChecksumLoader.php
+++ b/src/Checksum/ChecksumLoader.php
@@ -1,6 +1,6 @@
<?php
-namespace jtl\Connector\Example;
+namespace jtl\Connector\Example\Checksum;
use jtl\Connector\Checksum\IChecksumLoader;
diff --git a/src/Connector.php b/src/Connector.php
index 8442d6e..d6301fe 100644
--- a/src/Connector.php
+++ b/src/Connector.php
@@ -7,14 +7,13 @@
namespace jtl\Connector\Example;
use jtl\Connector\Base\Connector as BaseConnector;
-use jtl\Connector\Core\Exception\TransactionException;
use jtl\Connector\Core\Rpc\Method;
use jtl\Connector\Core\Rpc\RequestPacket;
use jtl\Connector\Core\Utilities\RpcMethod;
use jtl\Connector\Core\Controller\Controller as CoreController;
-use jtl\Connector\Example\ChecksumLoader;
-use jtl\Connector\Example\PrimaryKeyMapper;
-use jtl\Connector\Example\TokenLoader;
+use jtl\Connector\Example\Authentication\TokenLoader;
+use jtl\Connector\Example\Checksum\ChecksumLoader;
+use jtl\Connector\Example\Mapper\PrimaryKeyMapper;
use jtl\Connector\Result\Action;
/**
@@ -28,27 +27,20 @@ class Connector extends BaseConnector
/**
* Current Controller
*
- * @var jtl\Connector\Core\Controller\Controller
+ * @var \jtl\Connector\Core\Controller\Controller
*/
- protected $_controller;
+ protected $controller;
/**
- *
- * @var string
- */
- protected $_action;
-
- /**
- *
* @var string
*/
- protected $_config;
+ protected $action;
- protected function __construct()
+ public function initialize()
{
- $this->setPrimaryKeyMapper(new PrimaryKeyMapper());
- $this->setTokenLoader(new TokenLoader());
- $this->setChecksumLoader(new ChecksumLoader());
+ $this->setPrimaryKeyMapper(new PrimaryKeyMapper())
+ ->setTokenLoader(new TokenLoader())
+ ->setChecksumLoader(new ChecksumLoader());
}
/**
@@ -62,10 +54,10 @@ class Connector extends BaseConnector
$class = "\\jtl\\Connector\\Magento\\Controller\\{$controller}";
if (class_exists($class)) {
- $this->_controller = $class::getInstance();
- $this->_action = RpcMethod::buildAction($this->getMethod()->getAction());
+ $this->controller = $class::getInstance();
+ $this->action = RpcMethod::buildAction($this->getMethod()->getAction());
- return is_callable(array($this->_controller, $this->_action));
+ return is_callable(array($this->controller, $this->action));
}
return false;
@@ -81,14 +73,14 @@ class Connector extends BaseConnector
$config = $this->getConfig();
// Set the config to our controller
- $this->_controller->setConfig($config);
+ $this->controller->setConfig($config);
// Set the method to our controller
- $this->_controller->setMethod($this->getMethod());
+ $this->controller->setMethod($this->getMethod());
- if ($this->_action === Method::ACTION_PUSH || $this->_action === Method::ACTION_DELETE) {
+ if ($this->action === Method::ACTION_PUSH || $this->action === Method::ACTION_DELETE) {
if ($this->getMethod()->getController() === 'image') {
- return $this->_controller->{$this->_action}($requestpacket->getParams());
+ return $this->controller->{$this->action}($requestpacket->getParams());
}
if (!is_array($requestpacket->getParams())) {
@@ -97,15 +89,14 @@ class Connector extends BaseConnector
$action = new Action();
$results = array();
- $errors = array();
- if ($this->_action === Method::ACTION_PUSH && $this->getMethod()->getController() === 'product_price') {
+ if ($this->action === Method::ACTION_PUSH && $this->getMethod()->getController() === 'product_price') {
$params = $requestpacket->getParams();
- $result = $this->_controller->update($params);
+ $result = $this->controller->update($params);
$results[] = $result->getResult();
}
else {
foreach ($requestpacket->getParams() as $param) {
- $result = $this->_controller->{$this->_action}($param);
+ $result = $this->controller->{$this->action}($param);
$results[] = $result->getResult();
}
}
@@ -117,28 +108,28 @@ class Connector extends BaseConnector
return $action;
}
else {
- return $this->_controller->{$this->_action}($requestpacket->getParams());
+ return $this->controller->{$this->action}($requestpacket->getParams());
}
}
/**
* Getter Controller
*
- * @return jtl\Connector\Core\Controller\Controller
+ * @return \jtl\Connector\Core\Controller\Controller
*/
public function getController()
{
- return $this->_controller;
+ return $this->controller;
}
/**
* Setter Controller
*
- * @param jtl\Connector\Core\Controller\Controller $controller
+ * @param \jtl\Connector\Core\Controller\Controller $controller
*/
public function setController(CoreController $controller)
{
- $this->_controller = $controller;
+ $this->controller = $controller;
}
/**
@@ -148,7 +139,7 @@ class Connector extends BaseConnector
*/
public function getAction()
{
- return $this->_action;
+ return $this->action;
}
/**
@@ -158,6 +149,6 @@ class Connector extends BaseConnector
*/
public function setAction($action)
{
- $this->_action = $action;
+ $this->action = $action;
}
}
diff --git a/src/PrimaryKeyMapper.php b/src/Mapper/PrimaryKeyMapper.php
similarity index 97%
rename from src/PrimaryKeyMapper.php
rename to src/Mapper/PrimaryKeyMapper.php
index c120249..3f0d83d 100644
--- a/src/PrimaryKeyMapper.php
+++ b/src/Mapper/PrimaryKeyMapper.php
@@ -1,6 +1,6 @@
<?php
-namespace jtl\Connector\Example;
+namespace jtl\Connector\Example\Mapper;
use jtl\Connector\Core\Logger\Logger;
use jtl\Connector\Drawing\ImageRelationType;
--
GitLab