Merge pull request #82 from carakas/master

Add php 8 support to spoon library
forkcms · Jun 8, 2021 · 60e69d2 · 60e69d2
2 parents 8b4429f + cec8fca
commit 60e69d2
Show file tree

Hide file tree

Showing 22 changed files with 132 additions and 48 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.1, 7.2, 7.3, 7.4]
+        php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
         testsuite: ["unit"]
     name: PHPUnit - ${{ matrix.testsuite }} (PHP ${{ matrix.php }})
     services:
@@ -40,9 +40,12 @@ jobs:
       - name: Install dependencies
         env:
           FORK_ENV: test
+          SYMFONY_DEPRECATIONS_HELPER: "quiet"
         run: composer install -o
 
       - name: Execute tests
+        env:
+          SYMFONY_DEPRECATIONS_HELPER: "quiet"
         run: vendor/bin/simple-phpunit --testsuite=${{ matrix.testsuite}} --coverage-clover=${{ matrix.testsuite}}.clover
 
       - name: Upload Coverage report

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "spoon/library",
 	"type": "library",
-	"description": "A PHP5 library that is fast, easy to learn and fun!",
+	"description": "A PHP library that is fast, easy to learn and very much deprecated!",
 	"homepage": "http://www.spoon-library.com",
 	"license": "BSD-2-Clause",
 	"authors": [
@@ -11,9 +11,9 @@
 		}
 	],
 	"require": {
-		"php": "^7.1"
+		"php": "^7.1|^8.0"
 	},
 	"require-dev": {
-		"symfony/phpunit-bridge": "^3.3"
+		"symfony/phpunit-bridge": "^5.3"
 	}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/spoon/datagrid/datagrid.php b/spoon/datagrid/datagrid.php
@@ -1479,7 +1479,7 @@ public function setColumnConfirm($column, $message, $custom = null)
 	 * @param	mixed $columns					The columns wherein the result will appear.
 	 * @param	bool[optional] $overwrite		Should the result overwrite the current value?
 	 */
-	public function setColumnFunction($function, $arguments = null, $columns, $overwrite = false)
+	public function setColumnFunction($function, $arguments = null, $columns = null, $overwrite = false)
 	{
 		// has results
 		if($this->source->getNumResults() > 0)
@@ -1919,7 +1919,7 @@ public function setSortingColumns(array $columns, $default = null)
 	 * @param	string[optional] $desc				The icon for descending.
 	 * @param	string[optional] $descSelected		The icon when descending sort is applied.
 	 */
-	public function setSortingIcons($asc = null, $ascSelected = null, $desc = null, $descSelected)
+	public function setSortingIcons($asc = null, $ascSelected = null, $desc = null, $descSelected = null)
 	{
 		if($asc !== null) $this->sortingIcons['asc'] = (string) $asc;
 		if($ascSelected !== null) $this->sortingIcons['ascSelected'] = (string) $ascSelected;

diff --git a/spoon/tests/SpoonTest.php b/spoon/tests/SpoonTest.php
@@ -16,11 +16,9 @@ public function testGet()
 		$this->assertEquals(Spoon::get('stored_value'), $value);
 	}
 
-	/**
-	 * @expectedException SpoonException
-	 */
 	public function testGetFailure()
 	{
+		$this->expectException(SpoonException::class);
 		$this->assertEquals('I have no idea what I am doing.', Spoon::get('my_custom_value'));
 	}
 

diff --git a/spoon/tests/database/SpoonDatabaseLargeDataSet.php b/spoon/tests/database/SpoonDatabaseLargeDataSet.php
@@ -33,7 +33,7 @@ class SpoonDatabaseLargeDataSet extends TestCase
 	/**
 	 *
 	 */
-	public function setup()
+	public function setup(): void
 	{
 		$this->db = new SpoonDatabase('mysql', '127.0.0.1', 'root', 'spoon', 'spoon_tests');
 	}

diff --git a/spoon/tests/database/SpoonDatabaseTest.php b/spoon/tests/database/SpoonDatabaseTest.php
@@ -14,7 +14,7 @@ class SpoonDatabaseTest extends TestCase
 	 */
 	protected $db;
 
-	public function setup()
+	public function setup(): void
 	{
 		// create database object
 		$this->db = new SpoonDatabase('mysql', '127.0.0.1', 'root', 'spoon', 'spoon_tests');
@@ -284,8 +284,8 @@ public function testUpdateDate()
 	 */
 	public function testOptimize()
 	{
-		self::assertArraySubset([], $this->db->optimize('users'));
-		self::assertArraySubset([], $this->db->optimize(array('users')));
+		self::assertIsArray($this->db->optimize('users'));
+		self::assertIsArray($this->db->optimize(array('users')));
 	}
 
 	/**

diff --git a/spoon/tests/directory/SpoonDirectoryTest.php b/spoon/tests/directory/SpoonDirectoryTest.php
@@ -11,7 +11,7 @@ class SpoonDirectoryTest extends TestCase
 {
 	protected $path;
 
-	protected function setUp()
+	protected function setup(): void
 	{
 		// set path
 		$this->path = dirname(dirname(__FILE__)) . '/tmp';

diff --git a/spoon/tests/file/SpoonFileTest.php b/spoon/tests/file/SpoonFileTest.php
@@ -9,7 +9,7 @@
 
 class SpoonFileTest extends TestCase
 {
-	public function setup()
+	public function setup(): void
 	{
 		if(!defined('TMPPATH')) define('TMPPATH', dirname(realpath(dirname(__FILE__))) . '/tmp');
 
@@ -27,11 +27,9 @@ public function testDownload()
 		$this->assertFalse(SpoonFile::download($this->existingUrl, $this->destinationFile, false));
 	}
 
-	/**
-	 * @expectedException SpoonFileException
-	 */
 	public function testDownloadFailure()
 	{
+		$this->expectException(SpoonFileException::class);
 		SpoonFile::download($this->nonExistingUrl, $this->destinationFile);
 	}
 }
diff --git a/spoon/tests/form/SpoonFileFieldTest.php b/spoon/tests/form/SpoonFileFieldTest.php
@@ -19,7 +19,7 @@ class SpoonFileFieldTest extends TestCase
 	 */
 	protected $filePDF;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('filefield');
 		$this->filePDF = new SpoonFormFile('pdf');

diff --git a/spoon/tests/form/SpoonFormButtonTest.php b/spoon/tests/form/SpoonFormButtonTest.php
@@ -19,7 +19,7 @@ class SpoonFormButtonTest extends TestCase
 	 */
 	protected $frm;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('button');
 		$this->btnSubmit = new SpoonFormButton('submit', 'Submit', 'submit');

diff --git a/spoon/tests/form/SpoonFormCheckboxTest.php b/spoon/tests/form/SpoonFormCheckboxTest.php
@@ -19,7 +19,7 @@ class SpoonFormCheckboxTest extends TestCase
 	 */
 	protected $chkAgree;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('checkbox');
 		$this->chkAgree = new SpoonFormCheckbox('agree', true);

diff --git a/spoon/tests/form/SpoonFormDateTest.php b/spoon/tests/form/SpoonFormDateTest.php
@@ -21,7 +21,7 @@ class SpoonFormDateTest extends TestCase
 	 */
 	protected $txtDate;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('datefield');
 		$this->txtDate = new SpoonFormDate('date', strtotime('Last Monday'), 'd/m/Y');

diff --git a/spoon/tests/form/SpoonFormDropdownTest.php b/spoon/tests/form/SpoonFormDropdownTest.php
@@ -19,7 +19,7 @@ class SpoonFormDropdownTest extends TestCase
 	 */
 	protected $ddmSingle, $ddmMultiple, $ddmOptGroupSingle, $ddmOptGroupMultiple, $ddmDefaultElement;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('dropdown');
 		$this->ddmSingle = new SpoonFormDropdown('single', array(1 => 'Davy Hellemans', 'Tys Verkoyen', 'Dave Lens'));

diff --git a/spoon/tests/form/SpoonFormHiddenTest.php b/spoon/tests/form/SpoonFormHiddenTest.php
@@ -19,7 +19,7 @@ class SpoonFormHiddenTest extends TestCase
 	 */
 	protected $hidHidden;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('hiddenfield');
 		$this->hidHidden = new SpoonFormHidden('hidden', 'I am the default value');

diff --git a/spoon/tests/form/SpoonFormMultiCheckBoxTest.php b/spoon/tests/form/SpoonFormMultiCheckBoxTest.php
@@ -19,7 +19,7 @@ class SpoonFormMultiCheckBoxTest extends TestCase
 	 */
 	protected $chkHobbies;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('multicheckbox');
 		$hobbies[] = array('label' => 'Swimming', 'value' => 10);

diff --git a/spoon/tests/form/SpoonFormPasswordTest.php b/spoon/tests/form/SpoonFormPasswordTest.php
@@ -19,7 +19,7 @@ class SpoonFormPasswordTest extends TestCase
 	 */
 	protected $txtPassword;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('passwordfield');
 		$this->txtPassword = new SpoonFormPassword('name', 'I am the default value');

diff --git a/spoon/tests/form/SpoonFormRadiobuttonTest.php b/spoon/tests/form/SpoonFormRadiobuttonTest.php
@@ -24,7 +24,7 @@ class SpoonFormRadiobuttonTest extends TestCase
 	 */
 	protected $rbtNumeric;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('radiobutton');
 		$gender[] = array('label' => 'Female', 'value' => 'F');

diff --git a/spoon/tests/form/SpoonFormTextTest.php b/spoon/tests/form/SpoonFormTextTest.php
@@ -19,7 +19,7 @@ class SpoonFormTextTest extends TestCase
 	 */
 	protected $txtName;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('textfield');
 		$this->txtName = new SpoonFormText('name', 'I am the default value');

diff --git a/spoon/tests/form/SpoonFormTextareaTest.php b/spoon/tests/form/SpoonFormTextareaTest.php
@@ -19,7 +19,7 @@ class SpoonFormTextareaTest extends TestCase
 	 */
 	protected $txtMessage;
 
-	public function setup()
+	public function setup(): void
 	{
 		$this->frm = new SpoonForm('textarea');
 		$this->txtMessage = new SpoonFormTextarea('message', 'I am the default value');