Merge pull request #61 from lrqdo/check_alias_max_length

Make sure Ecommerce Alias is not too long
marlon-be · May 6, 2016 · 79acf5d · 79acf5d
2 parents a314e13 + 058be40
commit 79acf5d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,10 @@
 {
     "name": "marlon-be/marlon-ogone",
     "autoload": {
-        "psr-0": { "Ogone": "lib/" }
+        "psr-4": {
+            "Ogone\\": "lib/Ogone/",
+            "Ogone\\Tests\\": "tests/Ogone/Tests/"
+        }
     },
     "require": {
         "php": ">=5.3"

diff --git a/lib/Ogone/Ecommerce/Alias.php b/lib/Ogone/Ecommerce/Alias.php
@@ -20,6 +20,10 @@ class Alias
 
     public function __construct($alias, $aliasOperation = self::OPERATION_BY_MERCHANT, $aliasUsage = null)
     {
+        if (strlen($alias) > 50) {
+            throw new InvalidArgumentException("Alias is too long");
+        }
+
         if (preg_match('/[^a-zA-Z0-9_-]/', $alias)) {
             throw new InvalidArgumentException("Alias cannot contain special characters");
         }

diff --git a/tests/Ogone/Tests/Ecommerce/AliasTest.php b/tests/Ogone/Tests/Ecommerce/AliasTest.php
@@ -28,6 +28,15 @@ public function AliasCanHaveOperationByPsp()
         $this->assertEquals(Alias::OPERATION_BY_PSP, $alias->getAliasOperation());
     }
 
+    /**
+     * @test
+     * @expectedException \InvalidArgumentException
+     */
+    public function AliasIsMax50Characters()
+    {
+        new Alias(str_repeat('X', 51));
+    }
+
     /**
      * @test
      * @expectedException \InvalidArgumentException

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -21,9 +21,6 @@
 use Ogone\DirectLink\DirectLinkPaymentRequest;
 use Ogone\DirectLink\DirectLinkQueryRequest;
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once __DIR__.'/Ogone/Tests/ShaComposer/FakeShaComposer.php';
-
 abstract class TestCase extends PHPUnit_Framework_TestCase
 {
     /** @return EcommercePaymentRequest*/