From d7cbe758041ad4ab88ccb43290014c7f030c6da3 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Wed, 16 Oct 2024 11:41:35 -0600 Subject: [PATCH] Reviewed all code for obvious errors --- src/Auth/Authenticatable.php | 2 -- .../Connections/MysqlConnection.php | 36 +++++++++---------- .../Connections/OracleConnection.php | 28 +++++++-------- src/Console/DumpDatabaseCommand.php | 2 +- src/Console/EntityManagerProvider.php | 3 +- src/Console/GenerateProxiesCommand.php | 4 ++- src/Console/InfoCommand.php | 4 ++- src/EntityFactory.php | 0 src/Notifications/Notification.php | 14 -------- src/Pagination/Paginatable.php | 16 --------- .../Concerns/InteractsWithEntities.php | 18 ++-------- 11 files changed, 43 insertions(+), 84 deletions(-) delete mode 100644 src/EntityFactory.php delete mode 100644 src/Pagination/Paginatable.php diff --git a/src/Auth/Authenticatable.php b/src/Auth/Authenticatable.php index 4fd9ebdc..0a253ae4 100644 --- a/src/Auth/Authenticatable.php +++ b/src/Auth/Authenticatable.php @@ -8,11 +8,9 @@ trait Authenticatable { - /** @ORM\Column(type="string") */ #[ORM\Column(type: 'string')] protected string $password; - /** @ORM\Column(name="remember_token", type="string", nullable=true) */ #[ORM\Column(name: 'remember_token', type: 'string', nullable: true)] protected string $rememberToken; diff --git a/src/Configuration/Connections/MysqlConnection.php b/src/Configuration/Connections/MysqlConnection.php index 101ab100..f5ecb044 100644 --- a/src/Configuration/Connections/MysqlConnection.php +++ b/src/Configuration/Connections/MysqlConnection.php @@ -16,24 +16,24 @@ class MysqlConnection extends Connection public function resolve(array $settings = []): array { return [ - 'driver' => 'pdo_mysql', - 'host' => Arr::get($settings, 'host'), - 'dbname' => Arr::get($settings, 'database'), - 'user' => Arr::get($settings, 'username'), - 'password' => Arr::get($settings, 'password'), - 'charset' => Arr::get($settings, 'charset'), - 'port' => Arr::get($settings, 'port'), - 'unix_socket' => Arr::get($settings, 'unix_socket'), - 'ssl_key' => Arr::get($settings, 'ssl_key'), - 'ssl_cert' => Arr::get($settings, 'ssl_cert'), - 'ssl_ca' => Arr::get($settings, 'ssl_ca'), - 'ssl_capath' => Arr::get($settings, 'ssl_capath'), - 'ssl_cipher' => Arr::get($settings, 'ssl_cipher'), - 'prefix' => Arr::get($settings, 'prefix'), - 'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []), - 'serverVersion' => Arr::get($settings, 'serverVersion'), - 'wrapperClass' => Arr::get($settings, 'wrapperClass'), - 'driverOptions' => Arr::get($settings, 'options', []), + 'driver' => 'pdo_mysql', + 'host' => Arr::get($settings, 'host'), + 'dbname' => Arr::get($settings, 'database'), + 'user' => Arr::get($settings, 'username'), + 'password' => Arr::get($settings, 'password'), + 'charset' => Arr::get($settings, 'charset'), + 'port' => Arr::get($settings, 'port'), + 'unix_socket' => Arr::get($settings, 'unix_socket'), + 'ssl_key' => Arr::get($settings, 'ssl_key'), + 'ssl_cert' => Arr::get($settings, 'ssl_cert'), + 'ssl_ca' => Arr::get($settings, 'ssl_ca'), + 'ssl_capath' => Arr::get($settings, 'ssl_capath'), + 'ssl_cipher' => Arr::get($settings, 'ssl_cipher'), + 'prefix' => Arr::get($settings, 'prefix'), + 'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []), + 'serverVersion' => Arr::get($settings, 'serverVersion'), + 'wrapperClass' => Arr::get($settings, 'wrapperClass'), + 'driverOptions' => Arr::get($settings, 'options', []), ]; } } diff --git a/src/Configuration/Connections/OracleConnection.php b/src/Configuration/Connections/OracleConnection.php index 7a9aaf9e..5f98848e 100644 --- a/src/Configuration/Connections/OracleConnection.php +++ b/src/Configuration/Connections/OracleConnection.php @@ -16,20 +16,20 @@ class OracleConnection extends Connection public function resolve(array $settings = []): array { return [ - 'driver' => 'oci8', - 'host' => Arr::get($settings, 'host'), - 'dbname' => Arr::get($settings, 'database'), - 'servicename' => Arr::get($settings, 'service_name'), - 'service' => Arr::get($settings, 'service'), - 'user' => Arr::get($settings, 'username'), - 'password' => Arr::get($settings, 'password'), - 'charset' => Arr::get($settings, 'charset'), - 'port' => Arr::get($settings, 'port'), - 'prefix' => Arr::get($settings, 'prefix'), - 'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []), - 'persistent' => Arr::get($settings, 'persistent'), - 'wrapperClass' => Arr::get($settings, 'wrapperClass'), - 'connectstring' => Arr::get($settings, 'connectstring'), + 'driver' => 'oci8', + 'host' => Arr::get($settings, 'host'), + 'dbname' => Arr::get($settings, 'database'), + 'servicename' => Arr::get($settings, 'service_name'), + 'service' => Arr::get($settings, 'service'), + 'user' => Arr::get($settings, 'username'), + 'password' => Arr::get($settings, 'password'), + 'charset' => Arr::get($settings, 'charset'), + 'port' => Arr::get($settings, 'port'), + 'prefix' => Arr::get($settings, 'prefix'), + 'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []), + 'persistent' => Arr::get($settings, 'persistent'), + 'wrapperClass' => Arr::get($settings, 'wrapperClass'), + 'connectstring' => Arr::get($settings, 'connectstring'), ]; } } diff --git a/src/Console/DumpDatabaseCommand.php b/src/Console/DumpDatabaseCommand.php index e23b332f..d91b36eb 100644 --- a/src/Console/DumpDatabaseCommand.php +++ b/src/Console/DumpDatabaseCommand.php @@ -21,7 +21,7 @@ protected function configure(): void $this->setName('doctrine:dump:sqlite'); $this->setDescription(<<<'EOF' - doctrine:dump:sqlite +doctrine:dump:sqlite {--connection=sqlite} {--em=} diff --git a/src/Console/EntityManagerProvider.php b/src/Console/EntityManagerProvider.php index 486c8555..3abd448b 100644 --- a/src/Console/EntityManagerProvider.php +++ b/src/Console/EntityManagerProvider.php @@ -5,11 +5,12 @@ namespace LaravelDoctrine\ORM\Console; use Doctrine\ORM\EntityManagerInterface; +use Doctrine\ORM\Tools\Console\EntityManagerProvider as DoctrineEntityManagerProvider; use Doctrine\Persistence\ManagerRegistry; use function assert; -class EntityManagerProvider implements \Doctrine\ORM\Tools\Console\EntityManagerProvider +class EntityManagerProvider implements DoctrineEntityManagerProvider { public function __construct(private ManagerRegistry $managerRegistry) { diff --git a/src/Console/GenerateProxiesCommand.php b/src/Console/GenerateProxiesCommand.php index 75f53975..e3edcc99 100644 --- a/src/Console/GenerateProxiesCommand.php +++ b/src/Console/GenerateProxiesCommand.php @@ -4,7 +4,9 @@ namespace LaravelDoctrine\ORM\Console; -class GenerateProxiesCommand extends \Doctrine\ORM\Tools\Console\Command\GenerateProxiesCommand +use Doctrine\ORM\Tools\Console\Command\GenerateProxiesCommand as DoctrineGenerateProxiesCommand; + +class GenerateProxiesCommand extends DoctrineGenerateProxiesCommand { public function __construct(EntityManagerProvider $entityManagerProvider) { diff --git a/src/Console/InfoCommand.php b/src/Console/InfoCommand.php index c9e471a9..72f946f1 100644 --- a/src/Console/InfoCommand.php +++ b/src/Console/InfoCommand.php @@ -4,7 +4,9 @@ namespace LaravelDoctrine\ORM\Console; -class InfoCommand extends \Doctrine\ORM\Tools\Console\Command\InfoCommand +use Doctrine\ORM\Tools\Console\Command\InfoCommand as DoctrineInfoCommand; + +class InfoCommand extends DoctrineInfoCommand { public function __construct(EntityManagerProvider $entityManagerProvider) { diff --git a/src/EntityFactory.php b/src/EntityFactory.php deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Notifications/Notification.php b/src/Notifications/Notification.php index fdd907ad..8ac5a0e3 100644 --- a/src/Notifications/Notification.php +++ b/src/Notifications/Notification.php @@ -6,15 +6,9 @@ use Doctrine\ORM\Mapping as ORM; -/** @ORM\MappedSuperclass */ #[ORM\MappedSuperclass] class Notification { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ #[ORM\Id] #[ORM\GeneratedValue] #[ORM\Column(type: 'integer')] @@ -24,32 +18,24 @@ class Notification /** * The "level" of the notification (info, success, error). - * - * @ORM\Column(type="string") */ #[ORM\Column(type: 'string')] protected string $level = 'info'; /** * The message of the notification. - * - * @ORM\Column(type="string") */ #[ORM\Column(type: 'string')] protected string $message; /** * The text / label for the action. - * - * @ORM\Column(type="string") */ #[ORM\Column(type: 'string')] protected string $actionText; /** * The action URL. - * - * @ORM\Column(type="string") */ #[ORM\Column(type: 'string')] protected string $actionUrl; diff --git a/src/Pagination/Paginatable.php b/src/Pagination/Paginatable.php deleted file mode 100644 index d72ce6c0..00000000 --- a/src/Pagination/Paginatable.php +++ /dev/null @@ -1,16 +0,0 @@ -entityManager()->find($class, $id); @@ -31,7 +25,6 @@ public function entityExists(string $class, mixed $id): mixed return $entity; } - /** @throws PHPUnit_Framework_AssertionFailedError */ public function entityDoesNotExist(string $class, mixed $id): void { Assert::assertNull( @@ -44,8 +37,6 @@ public function entityDoesNotExist(string $class, mixed $id): void * @param mixed[] $criteria * * @return mixed[] - * - * @throws PHPUnit_Framework_AssertionFailedError */ public function entitiesMatch(string $class, array $criteria, int|null $count = null): mixed { @@ -65,11 +56,7 @@ public function entitiesMatch(string $class, array $criteria, int|null $count = return $entities; } - /** - * @param mixed[] $criteria - * - * @throws PHPUnit_Framework_AssertionFailedError - */ + /** @param mixed[] $criteria */ public function noEntitiesMatch(string $class, array $criteria): void { Assert::assertEmpty( @@ -101,7 +88,6 @@ private function outputCriteria(array $criteria): string return print_r($criteria, true); } - /** @throws PHPUnit_Framework_SkippedTestError */ protected function entityManager(): mixed { if (! isset($this->app)) {