Second commit

symbiote · Mar 25, 2018 · baa8514 · baa8514
1 parent 3559e50
commit baa8514
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,7 @@
 
 language: php
 
-dist: trusty
-
 php:
-  # Silverstripe 3.x
-  # NOTE: Travis-CI is only supporting PHP 5.4+ from late 2017.
   - 5.4
 
 env:
@@ -17,12 +13,12 @@ matrix:
   include:
     - php: 5.4
       env:
-        - DB=PGSQL
-        - CORE_RELEASE=3.2
+        - DB=MYSQL
+        - CORE_RELEASE=3.6
     - php: 5.5
       env:
         - DB=MYSQL
-        - CORE_RELEASE=3.3
+        - CORE_RELEASE=3.6
     - php: 5.6
       env:
         - DB=MYSQL

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Create components using SilverStripe.",
     "type": "silverstripe-module",
     "keywords": [
-        "silverstripe",
+        "silverstripe"
     ],
     "license": "BSD-3-Clause",
     "authors": [
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "~3.6",
+        "silverstripe/framework": "~3.6"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.0"

diff --git a/src/SilbinaryWolf/Components/TemplateParserComponentProvider.php b/src/SilbinaryWolf/Components/TemplateParserComponentProvider.php
@@ -55,8 +55,14 @@ public static function componentTemplate($res)
             $properties[$varName] = $value;
         }
 
-        $componentClass = Component::class;
-        $htmlTextClass = HTMLText::class;
+        // HTMLText::class / Component::class won't work in PHP versions below 5.5
+        // we just utilize the string values directly here.
+        //
+        // When this module stops supporting lower PHP versions, we will replace these
+        // values.
+        //
+        $componentClass = 'SilbinaryWolf\Components\Component';
+        $htmlTextClass = 'HTMLText';
 
         // Add HTML within the block as $Children variable
         $childrenText = $res['Template']['text'];

diff --git a/tests/ComponentTest.php b/tests/ComponentTest.php
@@ -9,14 +9,14 @@
 
 class ComponentTest extends SapphireTest
 {
-    public function setUp() 
+    public function setUp()
     {
         parent::setUp();
-        Config::inst()->update(SSViewer::class, 'source_file_comments', false);
-        Config::inst()->update(SSViewer_FromString::class, 'cache_template', false);
+        Config::inst()->update('SSViewer', 'source_file_comments', false);
+        Config::inst()->update('SSViewer_FromString', 'cache_template', false);
     }
 
-    public function tearDown() 
+    public function tearDown()
     {
         parent::tearDown();
     }
@@ -40,14 +40,37 @@ public function testSimpleCase()
         No submission
     </span>
 </button>
+HTML;
+        $this->assertEqualIgnoringWhitespace($expectedHTML, $resultHTML, 'Unexpected output');
+    }
+
+        /**
+         *
+         */
+    public function testPassingOptionalTypeProperty()
+    {
+        $template = <<<SSTemplate
+<% component MyComponentButton, "Class=btn btn-primary", "Type=submit" %>
+    <span class="text">
+        Submit me!
+    </span>
+<% end_component %>
+SSTemplate;
+        $resultHTML = SSViewer::fromString($template)->process(null);
+        $expectedHTML = <<<HTML
+<button class="btn btn-primary" type="submit">
+    <span class="text">
+        Submit me!
+    </span>
+</button>
 HTML;
         $this->assertEqualIgnoringWhitespace($expectedHTML, $resultHTML, 'Unexpected output');
     }
 
     /**
      * Taken from "framework\tests\view\SSViewerTest.php"
      */
-    protected function assertEqualIgnoringWhitespace($a, $b) 
+    protected function assertEqualIgnoringWhitespace($a, $b)
     {
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b));
     }