Merge branch 'master' into develop

ssheduardo · Aug 7, 2023 · d347683 · d347683
2 parents 70676af + cba1838
commit d347683
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All Notable changes to `Redsys` will be documented in this file
 
+## Version 1.4.4 (2023-08-07)
+
+### Added
+- Merge pull request from diegomarty.
+- Changed value by default in setMethod: T to C.
+- Added validation for this parameters: 'T', 'C', 'R', 'D', 'z', 'p', 'N'
+- Added new test for setMethod
+### Fixed
+- Nothing
+-
 ## Version 1.4.3 (2023-02-16)
 
 ### Added

diff --git a/src/Sermepa/Tpv/Tpv.php b/src/Sermepa/Tpv/Tpv.php
@@ -607,18 +607,29 @@ public function setTradeName($tradename = '')
     /**
      * Payment type
      *
-     * @param string $method [T o C = Sólo Tarjeta (mostrará sólo el formulario para datos de tarjeta)
-     *                       R = Pago por Transferencia, D = Domiciliación]
+     * @param string $method 
+     * [
+     *      T o C = Sólo Tarjeta (mostrará sólo el formulario para datos de tarjeta)
+     *      R = Pago por Transferencia, 
+     *      D = Domiciliación
+     *      z = Bizum
+     *      p = PayPal
+     *      N = Masterpass
+     * ]
      *
      * @return $this
      * @throws Exception
      */
-    public function setMethod($method = 'T')
+    public function setMethod($method = 'C')
     {
         if ($this->isEmpty($method)) {
             throw new TpvException('Add pay method');
         }
 
+        if (!in_array($method, ['T', 'C', 'R', 'D', 'z', 'p', 'N'])) {
+            throw new TpvException('Pay method is not valid');
+        }
+
         $this->_setParameters['DS_MERCHANT_PAYMETHODS'] = trim($method);
 
         return $this;

diff --git a/tests/TpvTest.php b/tests/TpvTest.php
@@ -541,4 +541,53 @@ public function set_new_parameters()
 
      }
 
+    public function invalidSetMethod()
+    {
+        return [
+            ['V'],
+            ['A'],
+            ['X'],
+            ['AA'],
+            ['Np'],
+        ];
+    }
+
+    /**
+     * @test
+     * @dataProvider invalidSetMethod
+     */
+    public function throw_when_set_method_is_invalid($method)
+    {
+        $this->expectExceptionMessage("Pay method is not valid");
+        $this->expectException(\Sermepa\Tpv\TpvException::class);
+        $redsys = new Tpv();
+        $redsys->setMethod($method);
+    }
+
+    public function methodsProvider()
+    {
+        return [
+            ['T'],
+            ['C'],
+            ['R'],
+            ['D'],
+            ['z'],
+            ['p'],
+            ['N']
+        ];
+    }
+
+    /**
+     *
+     * @test
+     * @dataProvider methodsProvider
+     */
+    public function should_validate_a_method($method)
+    {
+        $redsys = new Tpv();
+        $redsys->setMethod($method);
+        $parameters = $redsys->getParameters();
+        $this->assertArrayHasKey('DS_MERCHANT_PAYMETHODS', $parameters);
+    }
+
 }