since "String" is a reserved word in PHP7, had to replace all instanc…

…es of the class name
WPP-Public · Jun 12, 2017 · 6ddcff6 · 6ddcff6
1 parent d4a78be
commit 6ddcff6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Four things are required to generate a pdf or an image:
 ### Available Inputs
 
 - Request (generates content from a request)
-- String (content is specified by a string)
+- TextString (content is specified by a string)
 - Template (generates content from a SilverStripe template)
 - Url (generates content from a GET request to a Url)
 - Viewer (generates contetn from an SSViewer instance)
@@ -37,7 +37,7 @@ Four things are required to generate a pdf or an image:
 - Browser (outputs to the browser)
 - File (outputs to a file)
 - RandomFile (outputs to a random filename)
-- String (outputs to a string)
+- TextString (outputs to a string)
 
 ### Available Generators
 
@@ -82,7 +82,7 @@ new \Heyday\SilverStripe\WkHtml\Input\Request(
 #### String
 
 ```php
-new \Heyday\SilverStripe\WkHtml\Input\String(
+new \Heyday\SilverStripe\WkHtml\Input\TextString(
     <<<HTML
 <h1>Title</h1>
 HTML
@@ -187,7 +187,7 @@ new \Heyday\SilverStripe\WkHtml\Output\RandomFile(BASE_PATH);
 #### String
 
 ```php
-new \Heyday\SilverStripe\WkHtml\Output\String();
+new \Heyday\SilverStripe\WkHtml\Output\TextString();
 ```
 
 ##Unit Testing

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
 		}
 	},
 	"require": {
+		"php": "^7.0",
 		"composer/installers": "~1.0",
 		"knplabs/knp-snappy": "~0.2.0",
 		"symfony/process": "~2.2",

diff --git a/...yday/SilverStripe/WkHtml/Input/String.php → .../SilverStripe/WkHtml/Input/TextString.php b/...yday/SilverStripe/WkHtml/Input/String.php → .../SilverStripe/WkHtml/Input/TextString.php
@@ -3,10 +3,10 @@
 namespace Heyday\SilverStripe\WkHtml\Input;
 
 /**
- * Class String
+ * Class TextString
  * @package Heyday\SilverStripe\WkHtml\Input
  */
-class String implements InputInterface
+class TextString implements InputInterface
 {
     /**
      * @var string

diff --git a/...day/SilverStripe/WkHtml/Output/String.php → ...SilverStripe/WkHtml/Output/TextString.php b/...day/SilverStripe/WkHtml/Output/String.php → ...SilverStripe/WkHtml/Output/TextString.php
@@ -4,7 +4,7 @@
 
 use Knp\Snappy\GeneratorInterface;
 
-class String implements OutputInterface
+class TextString implements OutputInterface
 {
     /**
      * @param                    $input

diff --git a/tests/Heyday/SilverStripe/WkHtml/Input/StringTest.php b/tests/Heyday/SilverStripe/WkHtml/Input/StringTest.php
@@ -9,15 +9,15 @@
 class StringTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var String
+     * @var TextString
      */
     protected $object;
     /**
      *
      */
     protected function setUp()
     {
-        $this->object = new String('test');
+        $this->object = new TextString('test');
     }
     /**
      *

diff --git a/tests/Heyday/SilverStripe/WkHtml/Output/StringTest.php b/tests/Heyday/SilverStripe/WkHtml/Output/StringTest.php
@@ -7,7 +7,7 @@
 class StringTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var String
+     * @var TextString
      */
     protected $object;
 
@@ -17,7 +17,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-//        $this->object = new String;
+//        $this->object = new TextString;
     }
 
     /**
@@ -29,7 +29,7 @@ protected function tearDown()
     }
 
     /**
-     * @covers Heyday\SilverStripe\WkHtml\Output\String::process
+     * @covers Heyday\SilverStripe\WkHtml\Output\TextString::process
      * @todo   Implement testProcess().
      */
     public function testProcess()