Merge pull request #14 from giansalex/wssecurity-password-type

Add Type attribute to password (Security Header)

.gitattributes

@@ -5,5 +5,5 @@
 .php_cs.dist export-ignore
 .travis.yml export-ignore
 phpstan.neon export-ignore
-phpunit.xml export-ignore
+phpunit.xml.dist export-ignore
 README.md export-ignore

.travis.yml

@@ -1,29 +1,28 @@
 language: php
 
-php:
-  - 5.6
-  - 7.1
+git:
+  depth: 1
+
+matrix:
+  include:
+    - php: '5.6'
+      env:
+        - COVERAGE=true
+    - php: '7.1'
+      env:
+        - RUN_ANALYZER=true
 
 before_script:
   - composer install --prefer-source --no-interaction
 
 install:
-  - |
-    if [ $(phpenv version-name) = "7.1" ]; then
-    composer require php-coveralls/php-coveralls;
-    composer require --dev phpstan/phpstan;
-    fi
+  - if [ $COVERAGE ]; then composer require php-coveralls/php-coveralls; fi
+  - if [ $RUN_ANALYZER ]; then composer require --dev phpstan/phpstan; fi
 
 script:
   - mkdir -p build/logs
-  - |
-    if [ $(phpenv version-name) = "7.1" ]; then
-    vendor/bin/phpstan analyse src --level 1 -c phpstan.neon;
-    fi
-  - vendor/bin/phpunit --configuration phpunit.xml --coverage-clover build/logs/clover.xml
+  - if [ $RUN_ANALYZER ]; then vendor/bin/phpstan analyse src --level 1 -c phpstan.neon; fi
+  - vendor/bin/phpunit --exclude-group manual --coverage-clover build/logs/clover.xml
 
 after_success:
-  - |
-    if [ $(phpenv version-name) = "7.1" ]; then
-    travis_retry php vendor/bin/php-coveralls -v;
-    fi
+  - if [ $COVERAGE ]; then travis_retry php vendor/bin/php-coveralls -v; fi

phpstan.neon

@@ -1,3 +1,4 @@
 parameters:
 	ignoreErrors:
-	  - '#Greenter\\Ws\\Header\\WSSESecurityHeader::__construct\(\) does not call parent constructor from SoapHeader.#'
+	  - '#Greenter\\Ws\\Header\\WSSESecurityHeader::__construct\(\) does not call parent constructor from SoapHeader.#'
+	  - '#Call to an undefined static method SoapClient::__construct().#'

src/Ws/Header/WSSESecurityHeader.php

@@ -17,14 +17,17 @@
 class WSSESecurityHeader extends SoapHeader
 {
     const WSS_NAMESPACE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
+    const PASSWORD_TYPE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText';
+    const PASSWORD_FORMAT = '<o:Password xmlns:o="%s" Type="%s">%s</o:Password>';
 
     public function __construct($username, $password)
     {
+        $passwordXml = sprintf(self::PASSWORD_FORMAT, self::WSS_NAMESPACE, self::PASSWORD_TYPE, $password);
         $security = new SoapVar(
             [new SoapVar(
                 [
                     new SoapVar($username, XSD_STRING, null, null, 'Username', self::WSS_NAMESPACE),
-                    new SoapVar($password, XSD_STRING, null, null, 'Password', self::WSS_NAMESPACE),
+                    new SoapVar($passwordXml, XSD_ANYXML),
                 ],
                 SOAP_ENC_OBJECT,
                 null,

src/Ws/Services/SoapClient.php

@@ -9,26 +9,27 @@
 namespace Greenter\Ws\Services;
 
 use Greenter\Ws\Header\WSSESecurityHeader;
+use SoapFault;
 
 /**
  * Class SoapClient.
  */
-class SoapClient implements WsClientInterface
+class SoapClient extends \SoapClient implements WsClientInterface
 {
-    private $client;
-
     /**
      * SoapClient constructor.
      *
      * @param string $wsdl       Url of WSDL
      * @param array  $parameters Soap's parameters
+     *
+     * @throws SoapFault
      */
     public function __construct($wsdl = '', $parameters = [])
     {
         if (empty($wsdl)) {
             $wsdl = WsdlProvider::getBillPath();
         }
-        $this->client = new \SoapClient($wsdl, $parameters);
+        parent::__construct($wsdl, $parameters);
     }
 
     /**
@@ -37,7 +38,7 @@ public function __construct($wsdl = '', $parameters = [])
      */
     public function setCredentials($user, $password)
     {
-        $this->client->__setSoapHeaders(new WSSESecurityHeader($user, $password));
+        $this->__setSoapHeaders(new WSSESecurityHeader($user, $password));
     }
 
     /**
@@ -47,7 +48,7 @@ public function setCredentials($user, $password)
      */
     public function setService($url)
     {
-        $this->client->__setLocation($url);
+        $this->__setLocation($url);
     }
 
     /**
@@ -58,6 +59,6 @@ public function setService($url)
      */
     public function call($function, $arguments)
     {
-        return $this->client->__soapCall($function, $arguments);
+        return $this->__soapCall($function, $arguments);
     }
 }

tests/Ws/Services/FeSunatTest.php

@@ -35,6 +35,9 @@ public function testSendInvoice()
         );
     }
 
+    /**
+     * @group manual
+     */
     public function testSendInvoiceBillSender()
     {
         $nameXml = '20600055519-01-F001-00000001';
@@ -112,6 +115,9 @@ public function testSendInvalidVoided()
         $this->assertEquals('2001', $result->getError()->getCode());
     }
 
+    /**
+     * @group manual
+     */
     public function testSendSummaryV2()
     {
         $nameXml = '20000000001-RC-20171119-001';
@@ -138,6 +144,17 @@ public function testGetStatus()
         $this->assertContains('aceptada', $result->getCdrResponse()->getDescription());
     }
 
+    public function testGetStatusWithExceptionCode()
+    {
+        $wss = $this->getExtServiceMock();
+        $result = $wss->getStatus('667123123214');
+
+        $this->assertFalse($result->isSuccess());
+        $this->assertNull($result->getCdrResponse());
+        $this->assertGreaterThanOrEqual(100, intval($result->getCode()));
+        $this->assertLessThanOrEqual(1999, intval($result->getCode()));
+    }
+
     public function testGetStatusPending()
     {
         $service = $this->getExtServiceMock();

tests/Ws/Services/FeSunatTestTrait.php

@@ -181,6 +181,9 @@ private function getExtServiceMock()
 
                 if ('223123123213' === $ticket) {
                     $obj->status->statusCode = '98';
+                } elseif ('667123123214' === $ticket){
+                    $obj->status->statusCode = '1002';
+                    $obj->status->statusMessage = 'ERROR Z';
                 } else {
                     $obj->status->statusCode = '0';
                     $obj->status->content = file_get_contents(__DIR__.'/../../Resources/cdrBaja.zip');