From 448914e48fb7b91adb7d0f7cc58aad137646dccc Mon Sep 17 00:00:00 2001 From: syntaxerror Date: Fri, 4 May 2018 19:44:22 +0200 Subject: [PATCH 1/5] Rename object.php to baseobject.php --- system/library/{object.php => baseobject.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename system/library/{object.php => baseobject.php} (100%) diff --git a/system/library/object.php b/system/library/baseobject.php similarity index 100% rename from system/library/object.php rename to system/library/baseobject.php From d1427db8e8c9367bdbeb8ed3dd5b7350589323be Mon Sep 17 00:00:00 2001 From: syntaxerror Date: Fri, 4 May 2018 19:45:39 +0200 Subject: [PATCH 2/5] Rename Object class to BaseObject (for PHP 7.2) --- system/library/app.php | 2 +- system/library/baseobject.php | 2 +- system/library/config.php | 2 +- system/library/installer.php | 2 +- system/library/pagecache.php | 2 +- system/library/route.php | 2 +- system/library/security.php | 2 +- system/library/seo.php | 2 +- system/library/trigger.php | 2 +- system/library/url.php | 2 +- system/library/user.php | 2 +- system/library/utility.php | 2 +- system/library/version.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/system/library/app.php b/system/library/app.php index f7f8e555b..a74fd79e1 100644 --- a/system/library/app.php +++ b/system/library/app.php @@ -9,7 +9,7 @@ use Joomla\Profiler\Profiler; -class App extends Object +class App extends BaseObject { protected $registry; diff --git a/system/library/baseobject.php b/system/library/baseobject.php index 5a3c6339a..0847249a0 100644 --- a/system/library/baseobject.php +++ b/system/library/baseobject.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Object +class BaseObject { public function get($property, $default = null) diff --git a/system/library/config.php b/system/library/config.php index b35a84d62..3c10c7b4d 100644 --- a/system/library/config.php +++ b/system/library/config.php @@ -13,7 +13,7 @@ * @since 1.0 * @deprecated 1.3 - Use the Object class instead */ -class Config extends Object +class Config extends BaseObject { public function load($filename) diff --git a/system/library/installer.php b/system/library/installer.php index 6b9da9818..7c8655738 100644 --- a/system/library/installer.php +++ b/system/library/installer.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Installer extends Object +class Installer extends BaseObject { public function __construct($registry) diff --git a/system/library/pagecache.php b/system/library/pagecache.php index 90fbef899..523110d29 100644 --- a/system/library/pagecache.php +++ b/system/library/pagecache.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Pagecache extends Object +class Pagecache extends BaseObject { protected $key = null; diff --git a/system/library/route.php b/system/library/route.php index 2efe96cef..1f9cc4741 100644 --- a/system/library/route.php +++ b/system/library/route.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Route extends Object +class Route extends BaseObject { protected $registry; diff --git a/system/library/security.php b/system/library/security.php index 9b595ff8e..c99c2225a 100644 --- a/system/library/security.php +++ b/system/library/security.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Security extends Object +class Security extends BaseObject { protected $uri; diff --git a/system/library/seo.php b/system/library/seo.php index c5deac686..5c7411902 100644 --- a/system/library/seo.php +++ b/system/library/seo.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Seo extends Object +class Seo extends BaseObject { protected $registry; diff --git a/system/library/trigger.php b/system/library/trigger.php index b1bfecf72..81e6ce025 100644 --- a/system/library/trigger.php +++ b/system/library/trigger.php @@ -9,7 +9,7 @@ use Symfony\Component\Finder\Finder; -class Trigger extends Object +class Trigger extends BaseObject { protected $registry; diff --git a/system/library/url.php b/system/library/url.php index a67bdbcf8..422eec3b8 100644 --- a/system/library/url.php +++ b/system/library/url.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Url extends Object { +class Url extends BaseObject { protected $domain; protected $ssl; diff --git a/system/library/user.php b/system/library/user.php index d03040697..976675e59 100644 --- a/system/library/user.php +++ b/system/library/user.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class User extends Object { +class User extends BaseObject { protected $user_id; protected $username; diff --git a/system/library/utility.php b/system/library/utility.php index 228d1ceba..948b1ca49 100644 --- a/system/library/utility.php +++ b/system/library/utility.php @@ -7,7 +7,7 @@ * @link https://arastta.org */ -class Utility extends Object +class Utility extends BaseObject { protected $registry; diff --git a/system/library/version.php b/system/library/version.php index aa26a46ea..9fa6bf78a 100644 --- a/system/library/version.php +++ b/system/library/version.php @@ -14,7 +14,7 @@ * * @since 1.0 */ -final class Version extends Object +final class Version extends BaseObject { protected $name = 'Arastta'; From 6c94a7eedc30a7ca343027ce2bba4db81cad9d67 Mon Sep 17 00:00:00 2001 From: syntaxerror Date: Fri, 4 May 2018 21:19:17 +0200 Subject: [PATCH 3/5] Rename Object class to BaseObject (for PHP 7.2) --- system/library/app/admin.php | 2 +- system/library/app/catalog.php | 2 +- system/library/app/cli.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/library/app/admin.php b/system/library/app/admin.php index b42425033..363b5065a 100644 --- a/system/library/app/admin.php +++ b/system/library/app/admin.php @@ -19,7 +19,7 @@ public function initialise() $this->registry->set('filesystem', new Filesystem()); // Config - $this->registry->set('config', new Object()); + $this->registry->set('config', new BaseObject()); // Database $this->registry->set('db', new DB(DB_DRIVER, DB_HOSTNAME, DB_USERNAME, DB_PASSWORD, DB_DATABASE)); diff --git a/system/library/app/catalog.php b/system/library/app/catalog.php index dc460db5f..e31f5d9fd 100644 --- a/system/library/app/catalog.php +++ b/system/library/app/catalog.php @@ -19,7 +19,7 @@ public function initialise() $this->registry->set('filesystem', new Filesystem()); // Config - $this->registry->set('config', new Object()); + $this->registry->set('config', new BaseObject()); // Database $this->registry->set('db', new DB(DB_DRIVER, DB_HOSTNAME, DB_USERNAME, DB_PASSWORD, DB_DATABASE)); diff --git a/system/library/app/cli.php b/system/library/app/cli.php index a220bd255..f2fed284d 100644 --- a/system/library/app/cli.php +++ b/system/library/app/cli.php @@ -29,7 +29,7 @@ public function initialise() $this->registry->set('filesystem', $filesystem); // Config - $this->registry->set('config', new Object()); + $this->registry->set('config', new BaseObject()); // Loader $loader = new Loader($this->registry); From 7fa65c0124850c7e56e0592fd8ad4c4445cb4ae1 Mon Sep 17 00:00:00 2001 From: syntaxerror Date: Fri, 4 May 2018 21:21:57 +0200 Subject: [PATCH 4/5] Rename Object class to BaseObject (for PHP 7.2) --- catalog/event/app/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/event/app/theme.php b/catalog/event/app/theme.php index 4d102cc77..52c5d4751 100644 --- a/catalog/event/app/theme.php +++ b/catalog/event/app/theme.php @@ -14,7 +14,7 @@ public function preLoadView($template, &$data) { $theme = $this->config->get('config_template'); - $obj = new Object(); + $obj = new BaseObject(); $obj->setProperties(json_decode($this->config->get('theme_' . $theme), true)); $data['theme'] = $theme; From 377bfabcff1b07029294171442b58eac0d76ed66 Mon Sep 17 00:00:00 2001 From: syntaxerror Date: Fri, 4 May 2018 21:22:04 +0200 Subject: [PATCH 5/5] Rename Object class to BaseObject (for PHP 7.2)