Skip to content

Commit ee37522

Browse files
authored
Merge pull request #49 from se7enxweb/6.0.8
PHP 8.4 Support to eZ Publish Version 6.0.8
2 parents 3bcf09d + bdbcb50 commit ee37522

File tree

12 files changed

+22
-15
lines changed

12 files changed

+22
-15
lines changed

composer.json

100644100755
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"se7enxweb/git_manager": "git manager is a feature complete solution for updating your git based checkout directory containing eZ Publish software. Works well for users who rely on version control. Try it today and you won't be disappointed."
2525
},
2626
"require": {
27-
"php": "^7.4 || ^8.1",
27+
"php": "^8.1 || ^8.2",
2828
"ext-dom": "*",
2929
"ext-libxml": "*",
3030
"ext-mbstring": "*",
@@ -100,5 +100,11 @@
100100
"post-update-cmd": [
101101
"@legacy-scripts"
102102
]
103+
},
104+
"config": {
105+
"allow-plugins": {
106+
"se7enxweb/ezpublish-legacy-installer": true,
107+
"ezsystems/ezpublish-legacy-installer": true
108+
}
103109
}
104110
}

kernel/classes/ezcontentcachemanager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ public static function clearObjectViewCacheArray( array $objectIDList )
738738
* @param array|null $contentObjectList List of content object IDs to clear
739739
* @return boolean returns true on success
740740
*/
741-
public static function clearNodeViewCacheArray( array $nodeList, array $contentObjectList = null )
741+
public static function clearNodeViewCacheArray( array $nodeList, array|null $contentObjectList = null )
742742
{
743743
if ( count( $nodeList ) == 0 )
744744
{

kernel/classes/ezcontentobject.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6393,7 +6393,7 @@ function allowedAssignSectionList()
63936393
* @return array the IDs of all states we are allowed to set
63946394
* @param eZUser $user the user to check the policies of, when omitted the currently logged in user will be used
63956395
*/
6396-
function allowedAssignStateIDList( eZUser $user = null )
6396+
function allowedAssignStateIDList( eZUser|null $user = null )
63976397
{
63986398
if ( !$user instanceof eZUser )
63996399
{
@@ -6510,7 +6510,7 @@ function allowedAssignStateIDList( eZUser $user = null )
65106510
* @param eZUser|null $user
65116511
* @return array
65126512
*/
6513-
function allowedAssignStateList( eZUser $user = null )
6513+
function allowedAssignStateList( eZUser|null $user = null )
65146514
{
65156515
$allowedStateIDList = $this->allowedAssignStateIDList( $user );
65166516

kernel/classes/ezcontentobjecttreenode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5213,7 +5213,7 @@ function canCreateClassList( $asObject = false, $includeFilter = true, $groupLis
52135213
// This code is automatically generated from templates/classcreatelist.ctpl
52145214
// code-template::auto-generated:END can-instantiate-class-list
52155215

5216-
static public function makeObjectsArray( $array , $with_contentobject = true, array $propertiesOverride = null, $lang = null )
5216+
static public function makeObjectsArray( $array , $with_contentobject = true, array|null $propertiesOverride = null, $lang = null )
52175217
{
52185218
$retNodes = array();
52195219
if ( !is_array( $array ) )

kernel/classes/ezorder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ static function getShowOrdersQuery( $show, $table = null )
217217
/*!
218218
\return the active orders
219219
*/
220-
static function active( $asObject = true, $offset, $limit, $sortField = "created", $sortOrder = "asc", $show = eZOrder::SHOW_NORMAL )
220+
static function active( $asObject = true, $offset, $limit = 100000, $sortField = "created", $sortOrder = "asc", $show = eZOrder::SHOW_NORMAL )
221221
{
222222
if ( $sortField == "user_name" )
223223
{

kernel/private/classes/ezautoloadgenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class eZAutoloadGenerator
152152
/**
153153
* Constructs class to generate autoload arrays.
154154
*/
155-
function __construct( ezpAutoloadGeneratorOptions $options = null )
155+
function __construct( ezpAutoloadGeneratorOptions|null $options = null )
156156
{
157157
if ( $options === null )
158158
{

lib/ezsession/classes/ezsession.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static public function countActive()
263263
* @since 4.1
264264
* @return bool Depending on if eZSession is registrated as session handler.
265265
*/
266-
static protected function registerFunctions( $sessionName = false, ezpSessionHandler $handler = null )
266+
static protected function registerFunctions( $sessionName = false, ezpSessionHandler|null $handler = null )
267267
{
268268
if ( self::$hasStarted || self::$handlerInstance !== null )
269269
return false;
@@ -576,7 +576,7 @@ static public function hasStarted()
576576
* @since 4.4
577577
* @return ezpSessionHandler
578578
*/
579-
static public function getHandlerInstance( ezpSessionHandler $handler = null )
579+
static public function getHandlerInstance( ezpSessionHandler|null $handler = null )
580580
{
581581
if ( self::$handlerInstance === null )
582582
{

lib/ezutils/classes/ezdebug.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ function errorHandler( $errno, $errstr, $errfile, $errline )
347347
E_USER_WARNING => 'E_USER_WARNING',
348348
E_NOTICE => 'E_NOTICE',
349349
E_USER_NOTICE => 'E_USER_NOTICE',
350-
E_STRICT => 'E_STRICT' );
350+
// E_STRICT => 'E_STRICT'
351+
);
351352
// Since PHP 5.2
352353
if ( defined('E_RECOVERABLE_ERROR') )
353354
$GLOBALS['eZDebugPHPErrorNames'][E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';

lib/ezutils/classes/ezextension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class eZExtension
3636
* @param eZINI|null $siteINI Optional parameter to be able to only do change on specific instance of site.ini
3737
* @return string
3838
*/
39-
static function baseDirectory( eZINI $siteINI = null )
39+
static function baseDirectory( eZINI|null $siteINI = null )
4040
{
4141
if ( $siteINI === null )
4242
$siteINI = eZINI::instance();
@@ -57,7 +57,7 @@ static function baseDirectory( eZINI $siteINI = null )
5757
* @param eZINI|null $siteINI Optional parameter to be able to only do change on specific instance of site.ini
5858
* @return array
5959
*/
60-
public static function activeExtensions( $extensionType = false, eZINI $siteINI = null )
60+
public static function activeExtensions( $extensionType = false, eZINI|null $siteINI = null )
6161
{
6262
if ( $siteINI === null )
6363
{

lib/ezutils/classes/ezini.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ static function setIsTextCodecEnabled( $enabled )
316316
* @param string parameter parameter name
317317
* @return bool True if the the parameter is set.
318318
*/
319-
static function parameterSet( string $fileName = null, string $rootDir = null, &$section, &$parameter )
319+
static function parameterSet( $fileName = null, $rootDir = null, &$section=false, &$parameter=false )
320320
{
321321
if( $fileName == null )
322322
$fileName = 'site.ini';

0 commit comments

Comments
 (0)