Skip to content

PHP 8.1 support #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markstory merged 5 commits into from
Aug 30, 2022
Merged

PHP 8.1 support #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dd44d6
Refactored test fixture schema for CakePHP 4.3+
lilHermit Jul 11, 2022
23ed490
Refactored for ResultsetInterface extract deprecation
lilHermit Jul 11, 2022
fccc73c
Testsuite fixes
lilHermit Jul 16, 2022
4db5bf5
Fixed PHP 8.1 deprecation regarding ctype_digit
lilHermit Jul 16, 2022
a8704f0
Added some tests that cover the ctype_digit condition
lilHermit Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"source": "https://github.com/cakephp/acl"
},
"require": {
"php": "^7.2",
"php": ">=7.2",
"cakephp/cakephp": "^4.0",
Copy link
Copy Markdown
Member

@markstory markstory Aug 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we pin this to ^4.3 ?

Copy link
Copy Markdown
Contributor Author

@lilHermit lilHermit Aug 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@markstory You mean cakephp/cakephp ^4.3 ?

Copy link
Copy Markdown
Contributor Author

@lilHermit lilHermit Aug 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only reason I didn't was because only the tests need CakePHP 4.3, but that's really a decision for you guys

Copy link
Copy Markdown
Member

@markstory markstory Aug 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't changing the min PHP version effectively bump up the cake version as well though?

Copy link
Copy Markdown
Contributor Author

@lilHermit lilHermit Aug 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've rebased the PHP version to >=7.2 so we don't force a cakephp version bump

"cakephp/plugin-installer": "^1.2"
},
Expand Down
11 changes: 4 additions & 7 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<ini name="memory_limit" value="-1"/>
<ini name="apc.enable_cli" value="1"/>

<env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
<!-- SQLite
<env name="db_class" value="Cake\Database\Driver\Sqlite"/>
<env name="db_dsn" value="sqlite:///:memory:"/>
Expand All @@ -30,13 +31,9 @@
<directory>./tests/TestCase/</directory>
</testsuite>
</testsuites>
<listeners>
<listener class="\Cake\TestSuite\Fixture\FixtureInjector" file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
<arguments>
<object class="\Cake\TestSuite\Fixture\FixtureManager" />
</arguments>
</listener>
</listeners>
<extensions>
<extension class="\Cake\TestSuite\Fixture\PHPUnitExtension" />
</extensions>

<filter>
<whitelist>
Expand Down
2 changes: 1 addition & 1 deletion src/Model/Table/AclNodesTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function node($ref = null)

if (empty($ref)) {
return null;
} elseif (is_int($ref) || ctype_digit($ref)) {
} elseif (is_int($ref) || (is_string($ref) && ctype_digit($ref))) {
$ref = [
'id' => $ref,
];
Expand Down
4 changes: 2 additions & 2 deletions src/Model/Table/PermissionsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ public function getAclLink($aro, $aco)
if (empty($obj['Aro']) || empty($obj['Aco'])) {
return false;
}
$aro = $obj['Aro']->extract('id')->toArray();
$aco = $obj['Aco']->extract('id')->toArray();
$aro = $obj['Aro']->all()->extract('id')->toArray();
$aco = $obj['Aco']->all()->extract('id')->toArray();
$aro = current($aro);
$aco = current($aco);
$alias = $this->getAlias();
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/AcoActionsFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class AcoActionsFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
'model' => ['type' => 'string', 'default' => ''],
'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
'alias' => ['type' => 'string', 'default' => ''],
'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/AcoTwosFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class AcoTwosFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
'model' => ['type' => 'string', 'null' => true],
'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
'alias' => ['type' => 'string', 'default' => ''],
'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/AcosFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class AcosFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
'model' => ['type' => 'string', 'null' => true],
'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
'alias' => ['type' => 'string', 'default' => ''],
'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/AroTwosFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class AroTwosFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
'model' => ['type' => 'string', 'null' => true],
'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
'alias' => ['type' => 'string', 'default' => ''],
'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/ArosAcoTwosFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class ArosAcoTwosFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'aro_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
'aco_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
'_create' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_read' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_update' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_delete' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/ArosAcosFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class ArosAcosFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'aro_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
'aco_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
'_create' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_read' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_update' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_delete' => ['type' => 'string', 'length' => 2, 'default' => 0],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
16 changes: 0 additions & 16 deletions tests/Fixture/ArosFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,6 @@
class ArosFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer'],
'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
'model' => ['type' => 'string', 'null' => true],
'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
'alias' => ['type' => 'string', 'default' => ''],
'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
];

/**
* records property
*
Expand Down
18 changes: 0 additions & 18 deletions tests/Fixture/PeopleFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,6 @@
class PeopleFixture extends TestFixture
{

/**
* fields property
*
* @var array
*/
public $fields = [
'id' => ['type' => 'integer', 'null' => false],
'name' => ['type' => 'string', 'null' => false, 'length' => 32],
'mother_id' => ['type' => 'integer', 'null' => false],
'father_id' => ['type' => 'integer', 'null' => false],
'_constraints' => [
'PRIMARY' => ['type' => 'primary', 'columns' => ['id']],
],
'_indexes' => [
'mother_id' => ['type' => 'index', 'columns' => ['mother_id', 'father_id']],
],
];

/**
* records property
*
Expand Down
19 changes: 9 additions & 10 deletions tests/TestCase/AclExtrasTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,12 @@ public function testAddingControllers()
*/
public function testUpdateWithPlugins()
{
$this->deprecated(function () {
Plugin::getCollection()->clear();
Plugin::getCollection()->add(new \TestPlugin\Plugin());
Plugin::getCollection()->add(new \Nested\TestPluginTwo\Plugin());
//Plugin::routes();
});

$this->clearPlugins();
$this->loadPlugins([
new \TestPlugin\Plugin(),
new \Nested\TestPluginTwo\Plugin()
]);
$this->_clean();

$this->Task->expects($this->atLeast(3))
Expand Down Expand Up @@ -433,10 +433,9 @@ public function testUpdateWithPlugins()
*/
public function testSyncWithNestedPlugin()
{
$this->deprecated(function () {
Plugin::getCollection()->clear();
Plugin::getCollection()->add(new \Nested\TestPluginTwo\Plugin());
});
$this->clearPlugins();
$this->loadPlugins([new \Nested\TestPluginTwo\Plugin()]);

$this->_clean();

$this->Task->expects($this->atLeast(2))
Expand Down
Loading