tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10614 from creative-commoners/pulls/5/php82

Browse Source 
ENH PHP 8.2 support
This commit is contained in:
Guy Sartorelli 2022-12-21 15:39:32 +13:00 committed by GitHub
commit 5bf6835b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 131 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -27,7 +27,7 @@
"composer/installers": "^2.2",
"guzzlehttp/guzzle": "^7.5.0",
"guzzlehttp/psr7": "^2.4.0",
"embed/embed": "^4.4.4",
"embed/embed": "^4.4.7",
"league/csv": "^9.8.0",
"m1/env": "^2.2.0",
"monolog/monolog": "^3.2.0",

2
src/Control/HTTPRequest.php
View File

@ -579,7 +579,7 @@ class HTTPRequest implements ArrayAccess
$shiftCount = sizeof($patternParts ?? []);
$remaining = count($this->dirParts ?? []) - $i;
for ($j = 1; $j <= $remaining; $j++) {
$arguments["$${j}"] = $this->dirParts[$j + $i - 1];
$arguments['$' . $j] = $this->dirParts[$j + $i - 1];
}
$patternParts = array_merge($patternParts, array_keys($arguments ?? []));
break;

2
src/Dev/Constraint/SSListContains.php
View File

@ -20,6 +20,8 @@ class SSListContains extends Constraint implements TestOnly
*/
protected $matches = [];
protected SSListExporter $exporter;
/**
* Check if the list has left over items that don't match
*

2
src/Dev/Constraint/SSListContainsOnlyMatchingItems.php
View File

@ -19,6 +19,8 @@ class SSListContainsOnlyMatchingItems extends Constraint implements TestOnly
*/
private $match;
protected SSListExporter $exporter;
/**
* @var ViewableDataContains
*/

13
src/Dev/FixtureBlueprint.php
View File

@ -34,6 +34,8 @@ class FixtureBlueprint
*/
protected $class;
private FixtureFactory $factory;
/**
* @var array
*/
@ -70,6 +72,17 @@ class FixtureBlueprint
$this->defaults = $defaults;
}
public function getFactory(): FixtureFactory
{
return $this->factory;
}
public function setFactory(FixtureFactory $factory): static
{
$this->factory = $factory;
return $this;
}
/**
* @param string $identifier Unique identifier for this fixture type
* @param array $data Map of property names to their values.

2
src/Dev/SapphireTest.php
View File

@ -161,6 +161,8 @@ abstract class SapphireTest extends TestCase implements TestOnly
*/
protected static $tempDB = null;
protected FixtureFactory|bool $fixtureFactory;
/**
* @return TempDatabase
*/

2
src/ORM/Connect/MySQLDatabase.php
View File

@ -65,6 +65,8 @@ class MySQLDatabase extends Database implements TransactionManager
*/
private $transactionManager = null;
private int $transactionNesting = 0;
/**
* Default collation
*

1
src/ORM/Connect/MySQLStatement.php
View File

@ -73,7 +73,6 @@ class MySQLStatement extends Query
public function __destruct()
{
$this->statement->close();
$this->currentRecord = false;
}
/**

83
src/ORM/DataObject.php
View File

@ -6,6 +6,7 @@ use BadMethodCallException;
use Exception;
use InvalidArgumentException;
use LogicException;
use SilverStripe\Assets\Storage\DBFile;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector;
@ -2841,51 +2842,57 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// later referenced to update the parent dataobject
if ($val instanceof DBComposite) {
$val->bindTo($this);
$this->record[$fieldName] = $val;
$this->setFieldValue($fieldName, $val);
}
// Situation 2: Passing a literal or non-DBField object
} else {
// If this is a proper database field, we shouldn't be getting non-DBField objects
if (is_object($val) && $schema->fieldSpec(static::class, $fieldName)) {
throw new InvalidArgumentException('DataObject::setField: passed an object that is not a DBField');
}
if (!empty($val) && !is_scalar($val)) {
$dbField = $this->dbObject($fieldName);
if ($dbField && $dbField->scalarValueOnly()) {
throw new InvalidArgumentException(
sprintf(
'DataObject::setField: %s only accepts scalars',
$fieldName
)
);
}
}
// if a field is not existing or has strictly changed
if (!array_key_exists($fieldName, $this->original ?? []) || $this->original[$fieldName] !== $val) {
// TODO Add check for php-level defaults which are not set in the db
// TODO Add check for hidden input-fields (readonly) which are not set in the db
// At the very least, the type has changed
$this->changed[$fieldName] = self::CHANGE_STRICT;
if ((!array_key_exists($fieldName, $this->original ?? []) && $val)
|| (array_key_exists($fieldName, $this->original ?? []) && $this->original[$fieldName] != $val)
) {
// Value has changed as well, not just the type
$this->changed[$fieldName] = self::CHANGE_VALUE;
}
// Value has been restored to its original, remove any record of the change
} elseif (isset($this->changed[$fieldName])) {
unset($this->changed[$fieldName]);
}
// Value is saved regardless, since the change detection relates to the last write
$this->record[$fieldName] = $val;
$this->setFieldValue($fieldName, $val);
}
return $this;
}
private function setFieldValue(string $fieldName, mixed $val): void
{
$schema = static::getSchema();
// If this is a proper database field, we shouldn't be getting non-DBField objects
if (is_object($val) && !($val instanceof DBField) && $schema->fieldSpec(static::class, $fieldName)) {
throw new InvalidArgumentException('DataObject::setFieldValue: passed an object that is not a DBField');
}
if (!empty($val) && !is_scalar($val)) {
$dbField = $this->dbObject($fieldName);
if ($dbField && $dbField->scalarValueOnly()) {
throw new InvalidArgumentException(
sprintf(
'DataObject::setFieldValue: %s only accepts scalars',
$fieldName
)
);
}
}
// if a field is not existing or has strictly changed
if (!array_key_exists($fieldName, $this->original ?? []) || $this->original[$fieldName] !== $val) {
// TODO Add check for php-level defaults which are not set in the db
// TODO Add check for hidden input-fields (readonly) which are not set in the db
// At the very least, the type has changed
$this->changed[$fieldName] = self::CHANGE_STRICT;
if ((!array_key_exists($fieldName, $this->original ?? []) && $val)
|| (array_key_exists($fieldName, $this->original ?? []) && $this->original[$fieldName] != $val)
) {
// Value has changed as well, not just the type
$this->changed[$fieldName] = self::CHANGE_VALUE;
}
// Value has been restored to its original, remove any record of the change
} elseif (isset($this->changed[$fieldName])) {
unset($this->changed[$fieldName]);
}
// Value is saved regardless, since the change detection relates to the last write
$this->record[$fieldName] = $val;
}
/**
* Set the value of the field, using a casting object.
* This is useful when you aren't sure that a date is in SQL format, for example.

2
src/ORM/FieldType/DBBoolean.php
View File

@ -46,7 +46,7 @@ class DBBoolean extends DBField
{
$fieldName = $this->name;
if ($fieldName) {
$dataObject->$fieldName = ($this->value) ? 1 : 0;
$dataObject->setField($fieldName, $this->value ? 1 : 0);
} else {
$class = static::class;
throw new \RuntimeException("DBField::saveInto() Called on a nameless '$class' object");

3
src/ORM/FieldType/DBDecimal.php
View File

@ -88,7 +88,8 @@ class DBDecimal extends DBField
$fieldName = $this->name;
if ($fieldName) {
$dataObject->$fieldName = (float)preg_replace('/[^0-9.\-\+]/', '', $this->value ?? '');
$value = (float) preg_replace('/[^0-9.\-\+]/', '', $this->value ?? '');
$dataObject->setField($fieldName, $value);
} else {
throw new \UnexpectedValueException(
"DBField::saveInto() Called on a nameless '" . static::class . "' object"

2
src/ORM/FieldType/DBField.php
View File

@ -542,7 +542,7 @@ abstract class DBField extends ViewableData implements DBIndexable
"DBField::saveInto() Called on a nameless '" . static::class . "' object"
);
}
$dataObject->$fieldName = $this->value;
$dataObject->setField($fieldName, $this->value);
}
/**

2
src/ORM/FieldType/DBPercentage.php
View File

@ -45,7 +45,7 @@ class DBPercentage extends DBDecimal
$fieldName = $this->name;
if ($fieldName && $dataObject->$fieldName > 1.0) {
$dataObject->$fieldName = 1.0;
$dataObject->setField($fieldName, 1.0);
}
}
}

26
src/View/ViewableData.php
View File

@ -66,6 +66,11 @@ class ViewableData implements IteratorAggregate
*/
private static $casting_cache = [];
/**
* Acts as a PHP 8.2+ compliant replacement for dynamic properties
*/
private array $data = [];
// -----------------------------------------------------------------------------------------------------------------
/**
@ -191,7 +196,7 @@ class ViewableData implements IteratorAggregate
*/
public function hasField($field)
{
return property_exists($this, $field ?? '');
return property_exists($this, $field) || isset($this->data[$field]);
}
/**
@ -202,7 +207,10 @@ class ViewableData implements IteratorAggregate
*/
public function getField($field)
{
return $this->$field;
if (property_exists($this, $field)) {
return $this->$field;
}
return $this->data[$field];
}
/**
@ -215,7 +223,13 @@ class ViewableData implements IteratorAggregate
public function setField($field, $value)
{
$this->objCacheClear();
$this->$field = $value;
// prior to PHP 8.2 support ViewableData::setField() simply used `$this->field = $value;`
// so the following logic essentially mimics this behaviour, though without the use
// of now deprecated dynamic properties
if (property_exists($this, $field)) {
$this->$field = $value;
}
$this->data[$field] = $value;
return $this;
}
@ -509,14 +523,14 @@ class ViewableData implements IteratorAggregate
* A simple wrapper around {@link ViewableData::obj()} that automatically caches the result so it can be used again
* without re-running the method.
*
* @param string $field
* @param string $fieldName
* @param array $arguments
* @param string $identifier an optional custom cache identifier
* @return Object|DBField
*/
public function cachedCall($field, $arguments = [], $identifier = null)
public function cachedCall($fieldName, $arguments = [], $identifier = null)
{
return $this->obj($field, $arguments, true, $identifier);
return $this->obj($fieldName, $arguments, true, $identifier);
}
/**

17
src/View/ViewableData_Customised.php
View File

@ -59,19 +59,26 @@ class ViewableData_Customised extends ViewableData
return $this->customised->hasMethod($method) || $this->original->hasMethod($method);
}
public function cachedCall($field, $arguments = null, $identifier = null)
public function cachedCall($fieldName, $arguments = null, $identifier = null)
{
if ($this->customised->hasMethod($field) || $this->customised->hasField($field)) {
return $this->customised->cachedCall($field, $arguments, $identifier);
if ($this->customisedHas($fieldName)) {
return $this->customised->cachedCall($fieldName, $arguments, $identifier);
}
return $this->original->cachedCall($field, $arguments, $identifier);
return $this->original->cachedCall($fieldName, $arguments, $identifier);
}
public function obj($fieldName, $arguments = null, $cache = false, $cacheName = null)
{
if ($this->customised->hasField($fieldName) || $this->customised->hasMethod($fieldName)) {
if ($this->customisedHas($fieldName)) {
return $this->customised->obj($fieldName, $arguments, $cache, $cacheName);
}
return $this->original->obj($fieldName, $arguments, $cache, $cacheName);
}
private function customisedHas(string $fieldName): bool
{
return property_exists($this->customised, $fieldName) ||
$this->customised->hasField($fieldName) ||
$this->customised->hasMethod($fieldName);
}
}

2
tests/php/Core/Injector/AopProxyServiceTest/AnotherService.php
View File

@ -4,5 +4,7 @@ namespace SilverStripe\Core\Tests\Injector\AopProxyServiceTest;
class AnotherService
{
public $config_property;
public $filters = [];
}

1
tests/php/Core/Injector/AopProxyServiceTest/SampleService.php
View File

@ -4,6 +4,7 @@ namespace SilverStripe\Core\Tests\Injector\AopProxyServiceTest;
class SampleService
{
public $auto;
public $constructorVarOne;
public $constructorVarTwo;

1
tests/php/Core/Injector/InjectorTest/TestObject.php
View File

@ -6,6 +6,7 @@ use SilverStripe\Dev\TestOnly;
class TestObject implements TestOnly
{
public $auto;
public $sampleService;

2
tests/php/Dev/FixtureBlueprintTest.php
View File

@ -17,6 +17,8 @@ class FixtureBlueprintTest extends SapphireTest
protected $usesDatabase = true;
private int $_called = 0;
protected static $extra_dataobjects = [
TestDataObject::class,
DataObjectRelation::class,

19
tests/php/Forms/GridField/GridFieldFilterHeaderTest.php
View File

@ -138,18 +138,17 @@ class GridFieldFilterHeaderTest extends SapphireTest
public function testGetSearchForm()
{
$searchForm = $this->component->getSearchForm($this->gridField);
$this->assertTrue($searchForm instanceof Form);
$this->assertEquals('Search__q', $searchForm->fields[0]->Name);
$this->assertEquals('Search__Name', $searchForm->fields[1]->Name);
$this->assertEquals('Search__City', $searchForm->fields[2]->Name);
$this->assertEquals('Search__Cheerleader__Hat__Colour', $searchForm->fields[3]->Name);
$fields = $searchForm->Fields()->toArray();
$this->assertEquals('Search__q', $fields[0]->Name);
$this->assertEquals('Search__Name', $fields[1]->Name);
$this->assertEquals('Search__City', $fields[2]->Name);
$this->assertEquals('Search__Cheerleader__Hat__Colour', $fields[3]->Name);
$this->assertEquals('TeamsSearchForm', $searchForm->Name);
$this->assertEquals('cms-search-form', $searchForm->extraClasses['cms-search-form']);
foreach ($searchForm->fields as $field) {
$this->assertEquals('stacked', $field->extraClasses['stacked']);
$this->assertEquals('no-change-track', $field->extraClasses['no-change-track']);
$this->assertTrue($searchForm->hasExtraClass('cms-search-form'));
foreach ($fields as $field) {
$this->assertTrue($field->hasExtraClass('stacked'));
$this->assertTrue($field->hasExtraClass('no-change-track'));
}
}

4
tests/php/ORM/DataObjectTest.php
View File

@ -826,10 +826,6 @@ class DataObjectTest extends SapphireTest
$team1->Captain = $captain2;
$team1->write();
$this->assertEquals($captain2->ID, $team1->Captain->ID);
// Setter: Custom data (required by DataDifferencer)
$team1->Captain = DBField::create_field('HTMLFragment', '<p>No captain</p>');
$this->assertEquals('<p>No captain</p>', $team1->Captain);
}
/**

5
tests/php/View/ArrayDataTest/NonEmptyObject.php
View File

@ -6,8 +6,9 @@ use SilverStripe\Dev\TestOnly;
class NonEmptyObject implements TestOnly
{
static $c = "Cucumber";
public $a;
public $b;
public static $c = "Cucumber";
public function __construct()
{

2
tests/php/View/Embed/MockResponse.php
View File

@ -8,7 +8,7 @@ use Psr\Http\Message\StreamInterface;
class MockResponse implements ResponseInterface
{
private EmbedUnitTest $unitTest;
private string $firstReponse;
private string $firstResponse;
private string $secondResponse;
public function __construct(EmbedUnitTest $unitTest, string $firstResponse, string $secondResponse)

7
thirdparty/php-peg/Parser.php vendored
View File

@ -9,6 +9,13 @@
* the bracket if a failed match + restore has moved the current position backwards - so we have to check that too.
*/
class ParserRegexp {
public $parser;
public $rx;
public $matches;
public $match_pos;
public $check_pos;
function __construct( $parser, $rx ) {
$this->parser = $parser ;
$this->rx = $rx . 'Sx' ;