From 5dca09c0cbabf879f436417460052e66fdb18d37 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 17 Feb 2020 21:16:33 +0545 Subject: [PATCH 1/6] Adjust Travis to be a bit more like the other repos --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb2df90..270d1dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ matrix: env: matrix: - - LOWEST_DEPS="" - - LOWEST_DEPS="--prefer-lowest" + - PREFER_LOWEST="" + - PREFER_LOWEST="--prefer-lowest" services: - mysql @@ -24,11 +24,11 @@ before_script: # - mysql -e 'create database sabredav' - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini # - composer self-update - - composer update --prefer-source $LOWEST_DEPS + - composer update $PREFER_LOWEST script: - - find Core -name "*.php" | xargs -n1 php -l - - ./vendor/bin/sabre-cs-fixer fix . --dry-run --diff + - find Core -name "*.php" | xargs -n1 php -l + - ./vendor/bin/sabre-cs-fixer fix . --dry-run --diff cache: directories: From 100d5846d130ae548c13b1b544001af3a9b1d010 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 17 Feb 2020 21:26:22 +0545 Subject: [PATCH 2/6] Run phpstan in Travis --- .travis.yml | 18 ++++++++++++++++-- phpstan.neon | 6 ++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 phpstan.neon diff --git a/.travis.yml b/.travis.yml index 270d1dc..189f6f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,23 @@ matrix: fast_finish: true env: + global: + - RUN_PHPSTAN="FALSE" matrix: - PREFER_LOWEST="" - PREFER_LOWEST="--prefer-lowest" +install: + - if [ $RUN_PHPSTAN == "TRUE" ]; then composer require --dev phpstan/phpstan:^0.12; fi + +matrix: + include: + - name: 'PHPStan' + php: 7.4 + env: + - RUN_PHPSTAN="TRUE" + fast_finish: true + services: - mysql @@ -27,8 +40,9 @@ before_script: - composer update $PREFER_LOWEST script: - - find Core -name "*.php" | xargs -n1 php -l - - ./vendor/bin/sabre-cs-fixer fix . --dry-run --diff + - if [ $RUN_PHPSTAN == "FALSE" ]; then find Core -name "*.php" | xargs -n1 php -l; fi + - if [ $RUN_PHPSTAN == "FALSE" ]; then ./vendor/bin/sabre-cs-fixer fix . --dry-run --diff; fi + - if [ $RUN_PHPSTAN == "TRUE" ]; then php vendor/bin/phpstan.phar analyse Core html; fi cache: directories: diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000..b3cbdbe --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,6 @@ +parameters: + level: 0 + excludes_analyse: + - Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro/generate-sprite.php + - Core/Resources/Web/BaikalAdmin/GlyphiconsPro/generate-sprite.php + - html/res/core/BaikalAdmin/GlyphiconsPro/generate-sprite.php From 3662bf4cab986ca58f810fab20bac77abaff3ad3 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Sat, 15 Feb 2020 20:26:55 +0545 Subject: [PATCH 3/6] create null execute() method required by \Flake\Core\Controller --- Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php b/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php index 0449234..2bb278d 100644 --- a/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php +++ b/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php @@ -42,4 +42,9 @@ class HtmlBlockTemplated extends \Flake\Core\Controller { return $sHtml; } + + function execute() + { + // TODO: Implement execute() method. + } } From 84afbeed246d611f6ed37b3e342404c16ac6c0cd Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 17 Feb 2020 21:48:52 +0545 Subject: [PATCH 4/6] Ignore phpstan items that are not simple to fix right now --- phpstan.neon | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/phpstan.neon b/phpstan.neon index b3cbdbe..0f71779 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,3 +4,19 @@ parameters: - Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro/generate-sprite.php - Core/Resources/Web/BaikalAdmin/GlyphiconsPro/generate-sprite.php - html/res/core/BaikalAdmin/GlyphiconsPro/generate-sprite.php + ignoreErrors: + - + message: '#Instantiated class Flake\\Core\\Exception not found.#' + path: Core/Frameworks/Flake/Util/Frameworks.php + - + message: '#Call to an undefined method Baikal\\Model\\Config\\Standard::getDefaultSystemConfig\(\).#' + path: Core/Frameworks/Baikal/Model/Config/Standard.php + - + message: '#Call to static method compileCss\(\) on an unknown class Frameworks\\LessPHP\\Delegate.#' + path: Core/Frameworks/Flake/Controller/Page.php + - + message: '#Access to undefined constant Flake\\Core\\Model::LABELFIELD.#' + path: Core/Frameworks/Flake/Core/Model.php + - + message: '#Declaration of Flake\\Core\\Datastructure\\Chain::push\(Flake\\Core\\Datastructure\\Chainable \$value\) should be compatible with SplDoublyLinkedList::push\(\$value\)#' + path: Core/Frameworks/Flake/Core/Datastructure/Chain.php From 803fedc1c26df0c4dc2c001f1763605dce768e8c Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 17 Feb 2020 22:15:39 +0545 Subject: [PATCH 5/6] Declare undeclared vars and methods --- Core/Frameworks/Baikal/Core/PDOBasicAuth.php | 5 +++++ .../BaikalAdmin/Controller/Settings/Standard.php | 10 ++++++++++ .../BaikalAdmin/Controller/Settings/System.php | 10 ++++++++++ Core/Frameworks/BaikalAdmin/Controller/Users.php | 10 ++++++++++ Core/Frameworks/Flake/Controller/Cli.php | 5 +++++ Core/Frameworks/Flake/Controller/HtmlBlock.php | 5 +++++ .../Frameworks/Flake/Controller/HtmlBlockTemplated.php | 10 ++++++++++ Core/Frameworks/Flake/Controller/Page.php | 5 +++++ Core/Frameworks/Flake/Core/Database.php | 5 +++++ Core/Frameworks/Flake/Core/PostConnectionService.php | 5 +++++ Core/Frameworks/Flake/Core/Render/Zone.php | 3 +++ Core/Frameworks/Flake/Core/Requester.php | 7 +++++++ 12 files changed, 80 insertions(+) diff --git a/Core/Frameworks/Baikal/Core/PDOBasicAuth.php b/Core/Frameworks/Baikal/Core/PDOBasicAuth.php index 9270194..7eadb87 100644 --- a/Core/Frameworks/Baikal/Core/PDOBasicAuth.php +++ b/Core/Frameworks/Baikal/Core/PDOBasicAuth.php @@ -34,6 +34,11 @@ class PDOBasicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { */ protected $authRealm; + /** + * @var string + */ + private $currentUser; + /** * Creates the backend object. * diff --git a/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php b/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php index d6676d5..19e4f27 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php @@ -29,6 +29,16 @@ namespace BaikalAdmin\Controller\Settings; class Standard extends \Flake\Core\Controller { + /** + * @var \Baikal\Model\Config\Standard + */ + private $oModel; + + /** + * @var \Formal\Form + */ + private $oForm; + function execute() { $this->oModel = new \Baikal\Model\Config\Standard(PROJECT_PATH_SPECIFIC . "config.php"); diff --git a/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php b/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php index 4069fa1..120f74e 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php @@ -29,6 +29,16 @@ namespace BaikalAdmin\Controller\Settings; class System extends \Flake\Core\Controller { + /** + * @var \Baikal\Model\Config\System + */ + private $oModel; + + /** + * @var \Formal\Form + */ + private $oForm; + function execute() { $this->oModel = new \Baikal\Model\Config\System(PROJECT_PATH_SPECIFIC . "config.system.php"); diff --git a/Core/Frameworks/BaikalAdmin/Controller/Users.php b/Core/Frameworks/BaikalAdmin/Controller/Users.php index 55c29fa..291408d 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Users.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Users.php @@ -31,6 +31,16 @@ class Users extends \Flake\Core\Controller { protected $aMessages = []; + /** + * @var \Baikal\Model\User + */ + private $oModel; + + /** + * @var \Formal\Form + */ + private $oForm; + function execute() { if ($this->actionEditRequested()) { $this->actionEdit(); diff --git a/Core/Frameworks/Flake/Controller/Cli.php b/Core/Frameworks/Flake/Controller/Cli.php index 6430b1c..26b5067 100644 --- a/Core/Frameworks/Flake/Controller/Cli.php +++ b/Core/Frameworks/Flake/Controller/Cli.php @@ -29,6 +29,11 @@ namespace Flake\Controller; class Cli extends \Flake\Core\Render\Container { + /** + * @var array + */ + private $aArgs; + function render() { $this->sys_init(); $this->init(); diff --git a/Core/Frameworks/Flake/Controller/HtmlBlock.php b/Core/Frameworks/Flake/Controller/HtmlBlock.php index 6ffa2c7..4e4c630 100644 --- a/Core/Frameworks/Flake/Controller/HtmlBlock.php +++ b/Core/Frameworks/Flake/Controller/HtmlBlock.php @@ -29,6 +29,11 @@ namespace Flake\Controller; class HtmlBlock extends \Flake\Core\Controller { + /** + * @var string + */ + private $sHtml; + function __construct($sHtml) { $this->sHtml = $sHtml; } diff --git a/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php b/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php index 2bb278d..fd507d3 100644 --- a/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php +++ b/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php @@ -29,6 +29,16 @@ namespace Flake\Controller; class HtmlBlockTemplated extends \Flake\Core\Controller { + /** + * @var string + */ + private $sTemplatePath; + + /** + * @var array + */ + private $aMarkers; + function __construct($sTemplatePath, $aMarkers = []) { $this->sTemplatePath = $sTemplatePath; $this->aMarkers = $aMarkers; diff --git a/Core/Frameworks/Flake/Controller/Page.php b/Core/Frameworks/Flake/Controller/Page.php index 401b371..fb9252a 100644 --- a/Core/Frameworks/Flake/Controller/Page.php +++ b/Core/Frameworks/Flake/Controller/Page.php @@ -34,6 +34,11 @@ class Page extends \Flake\Core\Render\Container { protected $sMetaDescription = ""; protected $sTemplatePath = ""; + /** + * @var string + */ + private $sBaseUrl; + function __construct($sTemplatePath) { $this->sTemplatePath = $sTemplatePath; } diff --git a/Core/Frameworks/Flake/Core/Database.php b/Core/Frameworks/Flake/Core/Database.php index d73ad54..5aeb4f5 100644 --- a/Core/Frameworks/Flake/Core/Database.php +++ b/Core/Frameworks/Flake/Core/Database.php @@ -29,6 +29,11 @@ namespace Flake\Core; abstract class Database extends \Flake\Core\FLObject { + private $debugOutput; + private $debug_lastBuiltQuery; + private $store_lastBuiltQuery; + private $oDb; + /* common stuff */ protected function messageAndDie($sMessage) { diff --git a/Core/Frameworks/Flake/Core/PostConnectionService.php b/Core/Frameworks/Flake/Core/PostConnectionService.php index df4992e..2be6d9c 100644 --- a/Core/Frameworks/Flake/Core/PostConnectionService.php +++ b/Core/Frameworks/Flake/Core/PostConnectionService.php @@ -29,6 +29,11 @@ namespace Flake\Core; abstract class PostConnectionService extends \Flake\Core\FLObject { + /** + * @var array + */ + private $aParams; + function __construct($aParams = []) { $this->aParams = $aParams; } diff --git a/Core/Frameworks/Flake/Core/Render/Zone.php b/Core/Frameworks/Flake/Core/Render/Zone.php index 332de7b..ec81c2d 100644 --- a/Core/Frameworks/Flake/Core/Render/Zone.php +++ b/Core/Frameworks/Flake/Core/Render/Zone.php @@ -28,6 +28,9 @@ namespace Flake\Core\Render; class Zone extends \Flake\Core\FLObject { + private $oZonableObject; + private $sZone; + function __construct(&$oZonableObject, $sZone) { $this->oZonableObject = & $oZonableObject; $this->sZone = $sZone; diff --git a/Core/Frameworks/Flake/Core/Requester.php b/Core/Frameworks/Flake/Core/Requester.php index e2d167f..9a93dc2 100644 --- a/Core/Frameworks/Flake/Core/Requester.php +++ b/Core/Frameworks/Flake/Core/Requester.php @@ -28,6 +28,12 @@ namespace Flake\Core; abstract class Requester extends \Flake\Core\FLObject { + protected $sModelClass = ''; + protected $sOrderField = ''; + protected $sOrderDirection = 'ASC'; + protected $iLimitStart = false; + protected $iLimitNumber = false; + function __construct($sModelClass) { $this->sModelClass = $sModelClass; } @@ -61,6 +67,7 @@ abstract class Requester extends \Flake\Core\FLObject { return $this; } + abstract function addClauseEquals($sField, $sValue); abstract function execute(); abstract function count(); } From e985b33a47b030e01317ad62a000aadd23947445 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 17 Feb 2020 22:24:08 +0545 Subject: [PATCH 6/6] Fix Parameter of method Flake\Core\Model\Db::getByRequest() --- Core/Frameworks/Flake/Core/Model/Db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Frameworks/Flake/Core/Model/Db.php b/Core/Frameworks/Flake/Core/Model/Db.php index 38de18b..a33d5a1 100644 --- a/Core/Frameworks/Flake/Core/Model/Db.php +++ b/Core/Frameworks/Flake/Core/Model/Db.php @@ -49,7 +49,7 @@ abstract class Db extends \Flake\Core\Model { return $oRequester; } - static function &getByRequest(\FS\Core\Requester\Sql $oRequester) { + static function &getByRequest(\Flake\Core\Requester\Sql $oRequester) { // renvoie une collection de la classe du modèle courant (this) return $oRequester->execute(); }