Removed Trait and use base class instead

byjg · Apr 17, 2016 · b1bb0c2 · b1bb0c2
1 parent 0ba490b
commit b1bb0c2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,5 @@ install:
   - composer install
 
 script:
-  - phpunit --bootstrap vendor/autoload.php tests/
+  - phpunit
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+-->
+
+<!-- see http://www.phpunit.de/wiki/Documentation -->
+<phpunit bootstrap="./vendor/autoload.php"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnFailure="true">
+
+    <filter>
+        <whitelist>
+            <directory>./src</directory>
+        </whitelist>
+    </filter>
+
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+</phpunit>
diff --git a/src/Omnipay/Komerci/TraitRequest.php → src/Omnipay/Komerci/BaseRequest.php b/src/Omnipay/Komerci/TraitRequest.php → src/Omnipay/Komerci/BaseRequest.php
@@ -2,10 +2,12 @@
 
 namespace Omnipay\Komerci;
 
+use Omnipay\Common\Message\AbstractRequest;
+
 /**
  * Komerci Authorize Request
  */
-trait TraitRequest
+abstract class BaseRequest extends AbstractRequest
 {
     protected $endpoint = 'https://ecommerce.userede.com.br/pos_virtual/wskomerci/cap.asmx/';
     protected $endpointTest = 'https://ecommerce.userede.com.br/pos_virtual/wskomerci/cap_teste.asmx/';

diff --git a/src/Omnipay/Komerci/Message/WSAbstractRequest.php b/src/Omnipay/Komerci/Message/WSAbstractRequest.php
@@ -2,15 +2,13 @@
 
 namespace Omnipay\Komerci\Message;
 
-use Omnipay\Common\Message\AbstractRequest;
+use Omnipay\Komerci\BaseRequest;
 
 /**
  * Komerci Authorize Request
  */
-abstract class WSAbstractRequest extends AbstractRequest
+abstract class WSAbstractRequest extends BaseRequest
 {
-    use \Omnipay\Komerci\TraitRequest;
-
     public function getInstallments()
     {
         return $this->getParameter('installments');

diff --git a/src/Omnipay/Komerci/Message/WSVoidRequest.php b/src/Omnipay/Komerci/Message/WSVoidRequest.php
@@ -7,8 +7,6 @@
  */
 class WSVoidRequest extends WSAbstractRequest
 {
-    use \Omnipay\Komerci\TraitRequest;
-
     public function getPreAuth()
     {
         return $this->getParameter('preauth');