From 2ac4bdca2ab38990f891371282a3a17af290e78f Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sun, 1 Dec 2024 18:09:09 +0100 Subject: PHP Keywords and types should be in lowercase Follow PSR-12 and use lowercase variants of PHP reserved keywords. See: https://www.php-fig.org/psr/psr-12/#25-keywords-and-types Find all uppercase occurrences of "or", "and", "null", "true" and "false" and change them to the lowercase variant. --- core/namespace/ORM/Entity.php | 2 +- core/namespace/ORM/Repositories/CategoryRepository.php | 4 ++-- core/namespace/ORM/Repository.php | 10 +++++----- core/namespace/ORM/RepositorySearch.php | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'core/namespace/ORM') diff --git a/core/namespace/ORM/Entity.php b/core/namespace/ORM/Entity.php index 61b9371..5462b54 100644 --- a/core/namespace/ORM/Entity.php +++ b/core/namespace/ORM/Entity.php @@ -13,7 +13,7 @@ abstract class Entity implements EntityInterface { # Get attribute #=============================================================================== public function get(string $attribute) { - return $this->{$attribute} ?? NULL; + return $this->{$attribute} ?? null; } #=============================================================================== diff --git a/core/namespace/ORM/Repositories/CategoryRepository.php b/core/namespace/ORM/Repositories/CategoryRepository.php index 7c7b3f9..657940c 100644 --- a/core/namespace/ORM/Repositories/CategoryRepository.php +++ b/core/namespace/ORM/Repositories/CategoryRepository.php @@ -47,7 +47,7 @@ class CategoryRepository extends Repository { # element. PHP >= 8 will throw a PDOException when the number of # bound variables doesn't matches the number of tokens ("?") in # the SQL query, which is the case here if $value is NULL. - is_null($value) ? NULL : [$value] + is_null($value) ? null : [$value] ); # TODO: Virtual column _depth shall not be fetched into the entity class @@ -128,7 +128,7 @@ class CategoryRepository extends Repository { $UpdateStatement = $this->Database->prepare($query); $UpdateStatement->execute([$_parent, $Entity->get('parent')]); break; - } else if($_parent === NULL) { + } else if($_parent === null) { break; } } diff --git a/core/namespace/ORM/Repository.php b/core/namespace/ORM/Repository.php index e7750cb..ca3690f 100644 --- a/core/namespace/ORM/Repository.php +++ b/core/namespace/ORM/Repository.php @@ -23,7 +23,7 @@ abstract class Repository { return $Entity; } - return NULL; + return null; } #=============================================================================== @@ -60,7 +60,7 @@ abstract class Repository { # Gets an entity from the runtime cache #=============================================================================== protected function fetchInstance($identifier) { - return $this->entities[$identifier] ?? FALSE; + return $this->entities[$identifier] ?? false; } #=============================================================================== @@ -93,7 +93,7 @@ abstract class Repository { return $Statement->execute($params); } - return FALSE; + return false; } #=========================================================================== @@ -115,7 +115,7 @@ abstract class Repository { return $Statement->execute($params); } - return FALSE; + return false; } #=========================================================================== @@ -199,7 +199,7 @@ abstract class Repository { if(!empty($filter)) { foreach($filter as $column => $value) { - if($value === NULL) { + if($value === null) { $wheres[] = "$column IS NULL"; } else { $wheres[] = "$column = ?"; diff --git a/core/namespace/ORM/RepositorySearch.php b/core/namespace/ORM/RepositorySearch.php index aac46ef..66f27ea 100644 --- a/core/namespace/ORM/RepositorySearch.php +++ b/core/namespace/ORM/RepositorySearch.php @@ -8,7 +8,7 @@ trait RepositorySearch { #=============================================================================== # Get entities based on search query #=============================================================================== - public function search(string $search, array $filter = [], int $limit = NULL, int $offset = 0): array { + public function search(string $search, array $filter = [], int $limit = null, int $offset = 0): array { if(strlen($filter['year'] ?? '') !== 0) { $extend[] = 'YEAR(time_insert) = ? AND'; $params[] = $filter['year']; @@ -24,12 +24,12 @@ trait RepositorySearch { $params[] = $filter['day']; } - if(is_numeric($filter['user'] ?? NULL)) { + if(is_numeric($filter['user'] ?? null)) { $extend[] = 'user = ? AND'; $params[] = $filter['user']; } - if(is_numeric($filter['category'] ?? NULL)) { + if(is_numeric($filter['category'] ?? null)) { $extend[] = 'category = ? AND'; $params[] = $filter['category']; } -- cgit v1.2.3