Merge pull request #28 from krzysztof-gzocha/devel

Improved compser.json
krzysztof-gzocha · Jan 24, 2015 · 9e0776e · 9e0776e
2 parents 774c3ed 3aee1d3
commit 9e0776e
Show file tree

Hide file tree

Showing 17 changed files with 105 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -1,4 1,16 @@
 {
  "name": "krzysztof-gzocha/payu",
  "type": "library",
  "description": "Integration with PayU",
  "keywords": ["integration","payu","rest","api","money","transfer"],
  "homepage": "https://github.com/krzysztof-gzocha/payu",
  "license": "MIT",
  "authors": [
  {
  "name": "Krzysztof Gzocha",
  "role": "Developer"
  }
  ],
  "config": {
  "bin-dir": "bin",
  "vendor-dir": "vendor"
@@ -23,6 35,7 @@
  "symfony/validator": "@stable",
  "psr/log": "@stable",
  "php": ">=5.4.0",
  "ext-curl": "*",
  "kriswallsmith/buzz": "0.13"
  }
 }
diff --git a/src/Team3/Communication/Notification/NotificationInterface.php b/src/Team3/Communication/Notification/NotificationInterface.php
@@ -0,0 1,12 @@
 <?php
 /**
  * @author Krzysztof Gzocha <[email protected]>
  */
 
 namespace Team3\Communication\Notification;
 
 use Team3\Serializer\SerializableInterface;
 
 interface NotificationInterface extends SerializableInterface
 {
 }
diff --git a/src/Team3/Communication/Notification/OrderNotification.php b/src/Team3/Communication/Notification/OrderNotification.php
@@ -7,9 7,8 @@
 
 use Team3\Order\Model\OrderInterface;
 use JMS\Serializer\Annotation as JMS;
-use Team3\Serializer\SerializableInterface;
 
-class OrderNotification implements SerializableInterface
 class OrderNotification implements NotificationInterface
 {
  /**
  * @var OrderInterface

diff --git a/src/Team3/Communication/Notification/RefundNotification.php b/src/Team3/Communication/Notification/RefundNotification.php
@@ -0,0 1,54 @@
 <?php
 /**
  * @author Krzysztof Gzocha <[email protected]>
  */
 
 namespace Team3\Communication\Notification;
 
 use Team3\Communication\Response\Model\RefundModelInterface;
 use JMS\Serializer\Annotation as JMS;
 
 class RefundNotification implements NotificationInterface
 {
  /**
  * @var string
  * @JMS\Type("string")
  */
  private $orderId;
 
  /**
  * @var string
  * @JMS\Type("string")
  */
  private $extOrderId;
 
  /**
  * @var RefundModelInterface
  * @JMS\Type("Team3\Communication\Response\Model\RefundModelInterface")
  */
  private $refund;
 
  /**
  * @return string
  */
  public function getOrderId()
  {
  return $this->orderId;
  }
 
  /**
  * @return string
  */
  public function getExtOrderId()
  {
  return $this->extOrderId;
  }
 
  /**
  * @return RefundModelInterface
  */
  public function getRefund()
  {
  return $this->refund;
  }
 }
diff --git a/...ationProcess/OrderNotificationProcess.php → ...tificationProcess/NotificationProcess.php b/...ationProcess/OrderNotificationProcess.php → ...tificationProcess/NotificationProcess.php
@@ -10,7 10,7 @@
 use Team3\Serializer\SerializerInterface;
 use Team3\SignatureCalculator\Validator\SignatureValidatorInterface;
 
-class OrderNotificationProcess
 class NotificationProcess
 {
  const ORDER_NOTIFICATION_CLASS = 'Team3\Communication\Notification\OrderNotification';
 

diff --git a/...ocess/OrderNotificationProcessFactory.php → ...ionProcess/NotificationProcessFactory.php b/...ocess/OrderNotificationProcessFactory.php → ...ionProcess/NotificationProcessFactory.php
@@ -14,16 14,16 @@
 use Team3\SignatureCalculator\Validator\AlgorithmExtractor;
 use Team3\SignatureCalculator\Validator\SignatureValidator;
 
-class OrderNotificationProcessFactory implements OrderNotificationProcessFactoryInterface
 class NotificationProcessFactory implements NotificationProcessFactoryInterface
 {
  /**
  * @param LoggerInterface $logger
  *
- * @return OrderNotificationProcess
  * @return NotificationProcess
  */
  public function build(LoggerInterface $logger)
  {
- return new OrderNotificationProcess(
  return new NotificationProcess(
  $this->getSerializer($logger),
  $this->getSignatureValidator($logger),
  new AlgorithmsProvider()

diff --git a/...erNotificationProcessFactoryInterface.php → ...s/NotificationProcessFactoryInterface.php b/...erNotificationProcessFactoryInterface.php → ...s/NotificationProcessFactoryInterface.php
@@ -6,12 6,12 @@
 
 use Psr\Log\LoggerInterface;
 
-interface OrderNotificationProcessFactoryInterface
 interface NotificationProcessFactoryInterface
 {
  /**
  * @param LoggerInterface $logger
  *
- * @return OrderNotificationProcess
  * @return NotificationProcess
  */
  public function build(LoggerInterface $logger);
 }
diff --git a/src/Team3/Communication/Process/ResponseDeserializer/ResponseDeserializer.php b/src/Team3/Communication/Process/ResponseDeserializer/ResponseDeserializer.php
@@ -8,7 8,6 @@
 use Buzz\Message\MessageInterface;
 use Team3\Communication\Process\RequestProcessException;
 use Team3\Communication\Request\PayURequestInterface;
-use Team3\Communication\Response\EmptyResponse;
 use Team3\Communication\Response\ResponseInterface;
 use Team3\Serializer\SerializerException;
 use Team3\Serializer\SerializerInterface;

diff --git a/...3/Communication/Request/RequestStatus.php → ...unication/Request/Model/RequestStatus.php b/...3/Communication/Request/RequestStatus.php → ...unication/Request/Model/RequestStatus.php
@@ -3,7 3,7 @@
  * @author Krzysztof Gzocha <[email protected]>
  */
 
-namespace Team3\Communication\Request;
 namespace Team3\Communication\Request\Model;
 
 use JMS\Serializer\Annotation as JMS;
 

diff --git a/src/Team3/Communication/Response/OrderCreateResponse.php b/src/Team3/Communication/Response/OrderCreateResponse.php
@@ -7,7 7,7 @@
 
 use Team3\Communication\Request\OrderCreateRequest;
 use Team3\Communication\Request\PayURequestInterface;
-use Team3\Communication\Request\RequestStatus;
 use Team3\Communication\Request\Model\RequestStatus;
 use JMS\Serializer\Annotation as JMS;
 
 /**
@@ -39,7 39,7 @@ class OrderCreateResponse implements ResponseInterface
 
  /**
  * @var RequestStatus
- * @JMS\Type("Team3\Communication\Request\RequestStatus")
  * @JMS\Type("Team3\Communication\Request\Model\RequestStatus")
  * @JMS\SerializedName("status")
  */
  private $requestStatus;

diff --git a/src/Team3/Communication/Response/OrderStatusResponse.php b/src/Team3/Communication/Response/OrderStatusResponse.php
@@ -7,7 7,7 @@
 
 use Team3\Communication\Request\OrderStatusRequest;
 use Team3\Communication\Request\PayURequestInterface;
-use Team3\Communication\Request\RequestStatus;
 use Team3\Communication\Request\Model\RequestStatus;
 use Team3\Order\Model\OrderInterface;
 use JMS\Serializer\Annotation as JMS;
 
@@ -22,7 22,7 @@ class OrderStatusResponse implements ResponseInterface
 
  /**
  * @var RequestStatus
- * @JMS\Type("Team3\Communication\Request\RequestStatus")
  * @JMS\Type("Team3\Communication\Request\Model\RequestStatus")
  * @JMS\SerializedName("status")
  */
  private $requestStatus;

diff --git a/src/Team3/Communication/Response/RefundResponse.php b/src/Team3/Communication/Response/RefundResponse.php
@@ -7,7 7,7 @@
 
 use Team3\Communication\Request\PayURequestInterface;
 use Team3\Communication\Request\RefundRequest;
-use Team3\Communication\Request\RequestStatus;
 use Team3\Communication\Request\Model\RequestStatus;
 use JMS\Serializer\Annotation as JMS;
 use Team3\Communication\Response\Model\RefundModelInterface;
 
@@ -32,7 32,7 @@ class RefundResponse implements ResponseInterface
 
  /**
  * @var RequestStatus
- * @JMS\Type("Team3\Communication\Request\RequestStatus")
  * @JMS\Type("Team3\Communication\Request\Model\RequestStatus")
  */
  private $status;
 

diff --git a/...s/OrderNotificationProcessFactoryTest.php → ...rocess/NotificationProcessFactoryTest.php b/...s/OrderNotificationProcessFactoryTest.php → ...rocess/NotificationProcessFactoryTest.php
@@ -4,7 4,7 @@
 
 use Psr\Log\LoggerInterface;
 
-class OrderNotificationProcessFactoryTest extends \Codeception\TestCase\Test
 class NotificationProcessFactoryTest extends \Codeception\TestCase\Test
 {
  /**
  * @var \UnitTester
@@ -13,10 13,10 @@ class OrderNotificationProcessFactoryTest extends \Codeception\TestCase\Test
 
  public function testResult()
  {
- $factory = new OrderNotificationProcessFactory();
  $factory = new NotificationProcessFactory();
 
  $this->assertInstanceOf(
- '\Team3\Communication\Process\NotificationProcess\OrderNotificationProcess',
  '\Team3\Communication\Process\NotificationProcess\NotificationProcess',
  $factory->build($this->getLogger())
  );
  }

diff --git a/...nProcess/OrderNotificationProcessTest.php → ...cationProcess/NotificationProcessTest.php b/...nProcess/OrderNotificationProcessTest.php → ...cationProcess/NotificationProcessTest.php
@@ -9,7 9,7 @@
 use Team3\Serializer\SerializerInterface;
 use Team3\SignatureCalculator\Validator\SignatureValidatorInterface;
 
-class OrderNotificationProcessTest extends \Codeception\TestCase\Test
 class NotificationProcessTest extends \Codeception\TestCase\Test
 {
  /**
  * @var \UnitTester
@@ -18,7 18,7 @@ class OrderNotificationProcessTest extends \Codeception\TestCase\Test
 
  public function testCompletedStatus()
  {
- $factory = new OrderNotificationProcessFactory();
  $factory = new NotificationProcessFactory();
  $process = $factory->build($this->getMock('\Psr\Log\LoggerInterface'));
  $notification = $process->process(new TestCredentials(), $this->getRealNotification());
 
@@ -39,7 39,7 @@ public function testCompletedStatus()
 
  public function testPendingStatus()
  {
- $factory = new OrderNotificationProcessFactory();
  $factory = new NotificationProcessFactory();
  $process = $factory->build($this->getMock('\Psr\Log\LoggerInterface'));
  $notification = $process->process(
  new TestCredentials(),
@@ -63,7 63,7 @@ public function testPendingStatus()
 
  public function testResult()
  {
- $process = new OrderNotificationProcess(
  $process = new NotificationProcess(
  $this->getSerializer(),
  $this->getSignatureValidator(true)
  );
@@ -81,7 81,7 @@ public function testResult()
  */
  public function testValidationError()
  {
- $process = new OrderNotificationProcess(
  $process = new NotificationProcess(
  $this->getSerializer(),
  $this->getSignatureValidator(false)
  );

diff --git a/...mmunication/Request/RequestStatusTest.php → ...ation/Request/Model/RequestStatusTest.php b/...mmunication/Request/RequestStatusTest.php → ...ation/Request/Model/RequestStatusTest.php
@@ -1,5 1,5 @@
 <?php
-namespace Team3\Communication\Request;
 namespace Team3\Communication\Request\Model;
 
 class RequestStatusTest extends \Codeception\TestCase\Test
 {

diff --git a/tests/unit/Team3/Communication/Response/OrderCreateResponseTest.php b/tests/unit/Team3/Communication/Response/OrderCreateResponseTest.php
@@ -1,7 1,7 @@
 <?php
 namespace Team3\Communication\Response;
 
-use Team3\Communication\Request\RequestStatus;
 use Team3\Communication\Request\Model\RequestStatus;
 
 class OrderCreateResponseTest extends \Codeception\TestCase\Test
 {
@@ -37,7 37,7 @@ public function testParameters()
  );
 
  $this->assertInstanceOf(
- 'Team3\Communication\Request\RequestStatus',
  'Team3\Communication\Request\Model\RequestStatus',
  $response->getRequestStatus()
  );
  }

diff --git a/tests/unit/Team3/Communication/Response/OrderStatusResponseTest.php b/tests/unit/Team3/Communication/Response/OrderStatusResponseTest.php
@@ -1,7 1,7 @@
 <?php
 namespace Team3\Communication\Response;
 
-use Team3\Communication\Request\RequestStatus;
 use Team3\Communication\Request\Model\RequestStatus;
 use Team3\Order\Model\Order;
 
 /**