Skip to content

Commit d0ed71d

Browse files
authored
Merge pull request #15 from nguyenanhung/v3.1.14-develop
Adding PHP 8.2 support
2 parents 5322272 + b319e8a commit d0ed71d

File tree

11 files changed

+19
-3
lines changed

11 files changed

+19
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ user_guide_src/cilexer/pycilexer.egg-info/*
2929
*.sublime-project
3030
/tests/tests/
3131
/tests/results/
32+
test.php

system/core/Controller.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
* @author EllisLab Dev Team
5151
* @link https://codeigniter.com/userguide3/general/controllers.html
5252
*/
53+
#[AllowDynamicProperties]
5354
class CI_Controller {
5455

5556
/**

system/core/Loader.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
* @author EllisLab Dev Team
5050
* @link https://codeigniter.com/userguide3/libraries/loader.html
5151
*/
52+
#[AllowDynamicProperties]
5253
class CI_Loader {
5354

5455
// All these are set automatically. Don't mess with them.

system/core/URI.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,8 @@ public function uri_string()
644644
*/
645645
public function ruri_string()
646646
{
647-
return ltrim(load_class('Router', 'core')->directory, '/').implode('/', $this->rsegments);
647+
//return ltrim(load_class('Router', 'core')->directory, '/').implode('/', $this->rsegments);
648+
return ltrim((string) load_class('Router', 'core')->directory, '/').implode('/', $this->rsegments);
648649
}
649650

650651
}

system/database/DB_driver.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
* @author EllisLab Dev Team
5252
* @link https://codeigniter.com/userguide3/database/
5353
*/
54+
#[AllowDynamicProperties]
5455
abstract class CI_DB_driver {
5556

5657
/**

system/libraries/Driver.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
* @author EllisLab Dev Team
5151
* @link
5252
*/
53+
#[AllowDynamicProperties]
5354
class CI_Driver_Library {
5455

5556
/**

system/libraries/Image_lib.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ class CI_Image_lib {
8585
*/
8686
public $new_image = '';
8787

88+
/**
89+
* Path to destination image
90+
*
91+
* @var string
92+
*/
93+
public $dest_image = '';
94+
8895
/**
8996
* Image width
9097
*

system/libraries/Table.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,12 +489,12 @@ protected function _compile_template()
489489
return;
490490
}
491491

492-
$this->temp = $this->_default_template();
492+
$temp = $this->_default_template();
493493
foreach (array('table_open', 'thead_open', 'thead_close', 'heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'tbody_open', 'tbody_close', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close') as $val)
494494
{
495495
if ( ! isset($this->template[$val]))
496496
{
497-
$this->template[$val] = $this->temp[$val];
497+
$this->template[$val] = $temp[$val];
498498
}
499499
}
500500
}

thirdParty/MX/Controller.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
3939
* THE SOFTWARE.
4040
**/
41+
#[AllowDynamicProperties]
4142
class MX_Controller
4243
{
4344
public $autoload = array();

thirdParty/MX/Loader.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
3636
* THE SOFTWARE.
3737
**/
38+
#[AllowDynamicProperties]
3839
class MX_Loader extends CI_Loader
3940
{
4041
protected $_module;

0 commit comments

Comments
 (0)