Merge pull request #595 from formers/laravel-8

.gitignore

@@ -1,5 +1,6 @@
 # Development
 .idea
+.phpunit.result.cache
 
 # Dependencies
 composer.lock

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
   - nightly
 
 # This triggers builds to run on the new TravisCI infrastructure.

composer.json

@@ -16,20 +16,20 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
+    "php": ">=7.2.0",
     "anahkiasen/html-object": "~1.4",
-    "illuminate/config": "~5.0|^6.0|^7.0",
-    "illuminate/container": "~5.0|^6.0|^7.0",
-    "illuminate/http": "~5.0|^6.0|^7.0",
-    "illuminate/routing": "~5.0|^6.0|^7.0",
-    "illuminate/session": "~5.0|^6.0|^7.0",
-    "illuminate/translation": "~5.0|^6.0|^7.0",
-    "illuminate/support": "~5.0|^6.0|^7.0"
+    "illuminate/config": "~5.0|^6.0|^7.0|^8.0",
+    "illuminate/container": "~5.0|^6.0|^7.0|^8.0",
+    "illuminate/http": "~5.0|^6.0|^7.0|^8.0",
+    "illuminate/routing": "~5.0|^6.0|^7.0|^8.0",
+    "illuminate/session": "~5.0|^6.0|^7.0|^8.0",
+    "illuminate/translation": "~5.0|^6.0|^7.0|^8.0",
+    "illuminate/support": "~5.0|^6.0|^7.0|^8.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4",
-    "mockery/mockery": "~0.9.1",
-    "illuminate/database": "~5.0|^6.0|^7.0"
+    "phpunit/phpunit": "^8.5",
+    "mockery/mockery": "^1.3",
+    "illuminate/database": "~5.0|^6.0|^7.0|^8.0"
   },
   "autoload": {
     "psr-4": {

phpunit.xml

@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-  backupStaticAttributes="false"
-  bootstrap="vendor/autoload.php"
-  colors="true"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  processIsolation="false"
-  stopOnFailure="false"
-  syntaxCheck="false">
-
-  <testsuites>
-    <testsuite name="Former Test Suite">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+  backupStaticAttributes="false"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  convertErrorsToExceptions="true"
+  convertNoticesToExceptions="true"
+  convertWarningsToExceptions="true"
+  processIsolation="false"
+  stopOnFailure="false">
+  <testsuites>
+    <testsuite name="Former Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>

tests/Fields/CheckboxTest.php

@@ -583,7 +583,7 @@ public function testCanPushCheckboxesWithoutLabels()
 		$html = $this->former->label('<b>Views per Page</b>')->render();
 		$html .= $this->former->checkbox('per_page')->class('input')->render();
 
-		$this->assertInternalType('string', $html);
+		$this->assertIsString($html);
 	}
 
 	public function testDisabled()
@@ -606,6 +606,8 @@ public function testToStringMagicMethodShouldOnlyReturnString()
 		$this->former->group();
 		$output = $this->former->checkbox('foo')->text('bar').'';
 		$this->former->closeGroup();
+
+		$this->assertIsString($output);
 	}
 
 	public function testCanBeManualyDefinied()

tests/Fields/ChoiceCheckboxTest.php

@@ -431,5 +431,7 @@ public function testToStringMagicMethodShouldOnlyReturnString()
 		$this->former->group();
 		$output = $this->choiceCheckbox()->choices(array('foo')).'';
 		$this->former->closeGroup();
+
+		$this->assertIsString($output);
 	}
 }

tests/Fields/ChoiceRadioTest.php

@@ -431,5 +431,7 @@ public function testToStringMagicMethodShouldOnlyReturnString()
 		$this->former->group();
 		$output = $this->choiceRadio()->choices(array('foo')).'';
 		$this->former->closeGroup();
+
+        $this->assertIsString($output);
 	}
 }

tests/Fields/ChoiceSelectTest.php

@@ -333,7 +333,7 @@ public function testCanRenderSelectsDynamically()
 		$html[] = $this->former->choice('frmVehicleMake')->label('Make')->choices($this->choices)->wrapAndRender();
 
 		$results = implode(' ', $html);
-		$this->assertContains('control-group', $results);
+		$this->assertStringContainsString('control-group', $results);
 	}
 
 	public function testCanPopulateMultipleSelects()
@@ -410,8 +410,8 @@ public function testCanCreateRangeSelects()
 		$select = $this->former->choice('foo')->range(1, 10);
 
 		$this->assertEquals(range(1, 10), array_keys($select->getChoices()));
-		$this->assertContains('<option value="1">1</option>', $select->render());
-		$this->assertContains('<option value="10">10</option>', $select->render());
+		$this->assertStringContainsString('<option value="1">1</option>', $select->render());
+		$this->assertStringContainsString('<option value="10">10</option>', $select->render());
 	}
 
 	public function testCanCreateSelectGroups()
@@ -528,6 +528,6 @@ public function testSelectCanPickRightOptionWithOptgroups()
 		$select  = $this->former->choice('category_id')->choices($items)->value(1);
 		$matcher = '<optgroup label="foo"><option value="1" selected="selected">foo</option></optgroup><optgroup label="bar"><option value="3">bar</option><option value="4">baz</option></optgroup>';
 
-		$this->assertContains($matcher, $select->render());
+		$this->assertStringContainsString($matcher, $select->render());
 	}
 }

tests/Fields/HiddenTest.php

@@ -31,6 +31,6 @@ public function testCanPopulateHiddenFields()
 	public function testEncodedValue()
 	{
 		$input = $this->former->hidden('foo')->value('<a>bar</a>')->__toString();
-		$this->assertContains('value="&lt;a&gt;bar&lt;/a&gt;"', $input);
+		$this->assertStringContainsString('value="&lt;a&gt;bar&lt;/a&gt;"', $input);
 	}
 }

tests/Fields/InputTest.php

@@ -309,7 +309,7 @@ public function testCanCreateNumberRange()
 	{
 		$range = $this->former->number('foo')->range(1, 5)->__toString();
 
-		$this->assertContains('min="1" max="5"', $range);
+		$this->assertStringContainsString('min="1" max="5"', $range);
 	}
 
 	public function testLabelCastsToString()

tests/Fields/RadioTest.php

@@ -313,7 +313,7 @@ public function testInlineRadiosAreRendered()
 
 		$radio = $this->former->radio('foo', 'bar')->__toString();
 
-		$this->assertInternalType('string', $radio);
+		$this->assertIsString($radio);
 	}
 
 	public function testDisabled()
@@ -336,6 +336,8 @@ public function testToStringMagicMethodShouldOnlyReturnString()
 		$this->former->group();
 		$output = $this->former->radio('foo')->text('bar').'';
 		$this->former->closeGroup();
+
+        $this->assertIsString($output);
 	}
 
 	public function testCanBeManualyDefinied()

tests/Fields/SelectTest.php

@@ -333,7 +333,7 @@ public function testCanRenderSelectsDynamically()
 		$html[] = $this->former->select('frmVehicleMake')->label('Make')->options($this->options)->wrapAndRender();
 
 		$results = implode(' ', $html);
-		$this->assertContains('control-group', $results);
+		$this->assertStringContainsString('control-group', $results);
 	}
 
 	public function testCanPopulateMultipleSelects()
@@ -410,8 +410,8 @@ public function testCanCreateRangeSelects()
 		$select = $this->former->select('foo')->range(1, 10);
 
 		$this->assertEquals(range(1, 10), array_keys($select->getOptions()));
-		$this->assertContains('<option value="1">1</option>', $select->render());
-		$this->assertContains('<option value="10">10</option>', $select->render());
+		$this->assertStringContainsString('<option value="1">1</option>', $select->render());
+		$this->assertStringContainsString('<option value="10">10</option>', $select->render());
 	}
 
 	public function testCanCreateSelectGroups()
@@ -481,8 +481,8 @@ public function testOptionsSelectActsTheSameAsSelect()
 
 		$matcher = '<option value="0" selected="selected">foo</option><option value="1">bar</option>';
 
-		$this->assertContains($matcher, $select2);
-		$this->assertContains($matcher, $select);
+		$this->assertStringContainsString($matcher, $select2);
+		$this->assertStringContainsString($matcher, $select);
 	}
 
 	public function testCanRepopulateFromPostArrayNotation()
@@ -540,6 +540,6 @@ public function testSelectCanPickRightOptionWithOptgroups()
 		$select  = $this->former->select('category_id')->options($items, 1);
 		$matcher = '<optgroup label="foo"><option value="1" selected="selected">foo</option></optgroup><optgroup label="bar"><option value="3">bar</option><option value="4">baz</option></optgroup>';
 
-		$this->assertContains($matcher, $select->render());
+		$this->assertStringContainsString($matcher, $select->render());
 	}
 }

tests/Framework/NudeFrameworkTest.php

@@ -6,7 +6,7 @@
 class NudeFrameworkTest extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 

tests/Framework/TwitterBootstrap3Test.php

@@ -6,7 +6,7 @@
 class TwitterBootstrap3Test extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -206,6 +206,6 @@ public function testButtonsAreWrappedInSpecialClass()
 		$button  = $this->former->text('foo')->append($this->former->button('Search'))->wrapAndRender();
 		$matcher = '<span class="input-group-btn"><button class="btn" type="button">Search</button></span>';
 
-		$this->assertContains($matcher, $button);
+		$this->assertStringContainsString($matcher, $button);
 	}
 }

tests/Framework/TwitterBootstrap4Test.php

@@ -6,7 +6,7 @@
 class TwitterBootstrap4Test extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -207,6 +207,6 @@ public function testButtonsAreWrappedInSpecialClass()
 		$button  = $this->former->text('foo')->append($this->former->button('Search'))->wrapAndRender();
 		$matcher = '<span class="input-group-btn"><button class="btn" type="button">Search</button></span>';
 
-		$this->assertContains($matcher, $button);
+		$this->assertStringContainsString($matcher, $button);
 	}
 }

tests/Framework/TwitterBootstrapTest.php

@@ -7,7 +7,7 @@
 class TwitterBootstrapTest extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 

tests/Framework/ZurbFramework4Test.php

@@ -6,7 +6,7 @@
 class ZurbFramework4Test extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -63,7 +63,7 @@ public function testCanAppendHelpTexts()
 
 	public function testCantUseBootstrapReservedMethods()
 	{
-		$this->setExpectedException('BadMethodCallException');
+		$this->expectException('BadMethodCallException');
 
 		$this->former->text('foo')->blockHelp('bar')->__toString();
 	}

tests/Framework/ZurbFramework5Test.php

@@ -6,7 +6,7 @@
 class ZurbFramework5Test extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -63,7 +63,7 @@ public function testCanAppendHelpTexts()
 
 	public function testCantUseBootstrapReservedMethods()
 	{
-		$this->setExpectedException('BadMethodCallException');
+		$this->expectException('BadMethodCallException');
 
 		$this->former->text('foo')->blockHelp('bar')->__toString();
 	}

tests/Framework/ZurbFrameworkTest.php

@@ -6,7 +6,7 @@
 class ZurbFrameworkTest extends FormerTests
 {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -62,7 +62,7 @@ public function testCanAppendHelpTexts()
 
 	public function testCantUseBootstrapReservedMethods()
 	{
-		$this->setExpectedException('BadMethodCallException');
+		$this->expectException('BadMethodCallException');
 
 		$this->former->text('foo')->blockHelp('bar')->__toString();
 	}

tests/GroupTest.php

@@ -348,14 +348,14 @@ public function testFieldsInCustomGroupsAreRawByDefault()
 		$this->former->group('foobar');
 		$test = $this->former->text('foobar')->__toString();
 
-		$this->assertNotContains('control-group', $test);
+		$this->assertStringNotContainsString('control-group', $test);
 	}
 
 	public function testCanSetAttributesOnGroup()
 	{
 		$text = $this->former->text('foobar')->onGroupAddClass('foobar')->__toString();
 
-		$this->assertContains('control-group foobar', $text);
+		$this->assertStringContainsString('control-group foobar', $text);
 	}
 
 	public function testCloseUnopenedGroup()

tests/LiveValidationTest.php

@@ -616,7 +616,7 @@ public function testNoMaxFileOnSecondFile()
         $matcher2 = $this->matchField([], 'file', 'bar');
 
         $hiddenMaxSizeMatcher1 = $this->matchField(['value' => 102400], 'hidden', 'MAX_FILE_SIZE');
-        $hiddenMaxSizeMatcher2 = $this->matchField([[]], 'hidden', 'MAX_FILE_SIZE');
+        $hiddenMaxSizeMatcher2 = $this->matchField([], 'hidden', 'MAX_FILE_SIZE');
 
         $this->assertControlGroup($input1);
         $this->assertHTML($matcher1, $input1);

tests/MethodDispatcherTest.php

@@ -3,19 +3,23 @@
 
 use Former\TestCases\FormerTests;
 use Mockery;
-use PHPUnit_Framework_Assert;
 use ReflectionMethod;
 
 class MethodDispatcherTest extends FormerTests
 {
 	public function testCanAddRepositories()
 	{
 		$dispatcher = new MethodDispatcher($this->app, array());
-		$this->assertCount(0, PHPUnit_Framework_Assert::readAttribute($dispatcher, 'repositories'));
+
+		$reflector = new \ReflectionClass($dispatcher);
+		$attribute = $reflector->getProperty('repositories');
+		$attribute->setAccessible(true);
+
+		$this->assertCount(0, $attribute->getValue($dispatcher));
 
 		$dispatcher->addRepository('A\Namespace\\');
-		$this->assertCount(1, PHPUnit_Framework_Assert::readAttribute($dispatcher, 'repositories'));
-		$this->assertContains('A\Namespace\\', PHPUnit_Framework_Assert::readAttribute($dispatcher, 'repositories'));
+		$this->assertCount(1, $attribute->getValue($dispatcher));
+		$this->assertContains('A\Namespace\\', $attribute->getValue($dispatcher));
 	}
 
 	/**