mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-02-08 21:28:40 +00:00
Merge branch 'develop' of https://github.com/Orange-Management/phpOMS into develop
This commit is contained in:
commit
35d13cd7db
|
|
@ -14,8 +14,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace phpOMS\Algorithm\PathFinding;
|
namespace phpOMS\Algorithm\PathFinding;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\HeapItemInterface;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Node on grid.
|
* Node on grid.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace phpOMS\DataStorage\Database\Query;
|
namespace phpOMS\DataStorage\Database\Query;
|
||||||
|
|
||||||
use PDOStatement;
|
|
||||||
use phpOMS\Algorithm\Graph\DependencyResolver;
|
use phpOMS\Algorithm\Graph\DependencyResolver;
|
||||||
use phpOMS\Contract\SerializableInterface;
|
use phpOMS\Contract\SerializableInterface;
|
||||||
use phpOMS\DataStorage\Database\BuilderAbstract;
|
use phpOMS\DataStorage\Database\BuilderAbstract;
|
||||||
|
|
@ -1389,11 +1388,11 @@ class Builder extends BuilderAbstract
|
||||||
/**
|
/**
|
||||||
* Execute query.
|
* Execute query.
|
||||||
*
|
*
|
||||||
* @return ?PDOStatement
|
* @return ?\PDOStatement
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public function execute() : ?PDOStatement
|
public function execute() : ?\PDOStatement
|
||||||
{
|
{
|
||||||
$sth = null;
|
$sth = null;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,6 @@ abstract class StatusAbstract
|
||||||
/** @var Directory|File $child */
|
/** @var Directory|File $child */
|
||||||
foreach ($directories as $child) {
|
foreach ($directories as $child) {
|
||||||
if ($child instanceof Directory) {
|
if ($child instanceof Directory) {
|
||||||
|
|
||||||
/** @var File $file */
|
/** @var File $file */
|
||||||
foreach ($child as $file) {
|
foreach ($child as $file) {
|
||||||
if (!\is_dir(__DIR__ . '/../../' . $child->getName() . '/' . \basename($file->getName(), '.php'))
|
if (!\is_dir(__DIR__ . '/../../' . $child->getName() . '/' . \basename($file->getName(), '.php'))
|
||||||
|
|
@ -223,7 +222,6 @@ abstract class StatusAbstract
|
||||||
/** @var Directory|File $child */
|
/** @var Directory|File $child */
|
||||||
foreach ($directories as $child) {
|
foreach ($directories as $child) {
|
||||||
if ($child instanceof Directory) {
|
if ($child instanceof Directory) {
|
||||||
|
|
||||||
/** @var File $file */
|
/** @var File $file */
|
||||||
foreach ($child as $file) {
|
foreach ($child as $file) {
|
||||||
if (!\is_dir(__DIR__ . '/../../' . $child->getName() . '/' . \basename($file->getName(), '.php'))
|
if (!\is_dir(__DIR__ . '/../../' . $child->getName() . '/' . \basename($file->getName(), '.php'))
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ declare(strict_types=1);
|
||||||
namespace phpOMS\Views;
|
namespace phpOMS\Views;
|
||||||
|
|
||||||
use phpOMS\Contract\RenderableInterface;
|
use phpOMS\Contract\RenderableInterface;
|
||||||
use phpOMS\System\File\PathException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* View Abstract.
|
* View Abstract.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user