From f6baf1142c9a147f85fa5cbf6e7245d083c95c87 Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Fri, 1 Mar 2019 11:04:12 +0100 Subject: [PATCH] Made all properties of the Model, View and Controller protected. These should not be accessible from outside these types of objects. Also made FuzeWorks core a requirement and not a dev-requirement. --- composer.json | 4 ++-- src/FuzeWorks/Controller.php | 12 ++++++------ src/FuzeWorks/Model.php | 8 ++++---- src/FuzeWorks/View.php | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 00cffb5..b7b476e 100644 --- a/composer.json +++ b/composer.json @@ -13,10 +13,10 @@ } ], "require": { - "php": ">=7.1.0" + "php": ">=7.1.0", + "fuzeworks/core": "1.2.0-RC2" }, "require-dev": { - "fuzeworks/core": "1.2.0-RC2", "phpunit/phpunit": "^7", "mikey179/vfsstream": "1.6.5" }, diff --git a/src/FuzeWorks/Controller.php b/src/FuzeWorks/Controller.php index 4b1acef..f171162 100644 --- a/src/FuzeWorks/Controller.php +++ b/src/FuzeWorks/Controller.php @@ -49,32 +49,32 @@ abstract class Controller /** * @var Plugins */ - public $plugins; + protected $plugins; /** * @var Libraries */ - public $libraries; + protected $libraries; /** * @var Helpers */ - public $helpers; + protected $helpers; /** * @var Config */ - public $config; + protected $config; /** * @var Controllers */ - public $controllers; + protected $controllers; /** * @var Models */ - public $models; + protected $models; public function __construct() { diff --git a/src/FuzeWorks/Model.php b/src/FuzeWorks/Model.php index 4c14fdd..796bb60 100644 --- a/src/FuzeWorks/Model.php +++ b/src/FuzeWorks/Model.php @@ -50,22 +50,22 @@ abstract class Model /** * @var Plugins */ - public $plugins; + protected $plugins; /** * @var Libraries */ - public $libraries; + protected $libraries; /** * @var Helpers */ - public $helpers; + protected $helpers; /** * @var Config */ - public $config; + protected $config; public function __construct() { diff --git a/src/FuzeWorks/View.php b/src/FuzeWorks/View.php index f8d05a5..fa86c8c 100644 --- a/src/FuzeWorks/View.php +++ b/src/FuzeWorks/View.php @@ -51,22 +51,22 @@ abstract class View /** * @var Plugins */ - public $plugins; + protected $plugins; /** * @var Libraries */ - public $libraries; + protected $libraries; /** * @var Helpers */ - public $helpers; + protected $helpers; /** * @var Config */ - public $config; + protected $config; /** * The controller associated with this view