Merge pull request #768 from syntaxerror/object

Fixing #767 - Renaming Object to BaseObject
arastta · May 8, 2018 · 1e36d49 · 1e36d49
2 parents 4c828f2 + 377bfab
commit 1e36d49
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git 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;

diff --git 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/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
@@ -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
@@ -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);

diff --git a/system/library/object.php → system/library/baseobject.php b/system/library/object.php → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,7 +14,7 @@
  *
  * @since  1.0
  */
-final class Version extends Object
+final class Version extends BaseObject
 {
 
     protected $name = 'Arastta';