Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Libs/Utils/Doctrine/EscapingQuoteStrategy.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\ORM\Mapping\QuoteStrategy;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\JoinColumnMapping;
use Doctrine\ORM\Mapping\ManyToManyOwningSideMapping;

/**
* A set of rules for determining the physical column, alias and table quotes and automatically escape database reserved
Expand All @@ -26,7 +28,7 @@ class EscapingQuoteStrategy implements QuoteStrategy
/**
* {@inheritdoc}
*/
public function getColumnName($fieldName, ClassMetadata $class, AbstractPlatform $platform)
public function getColumnName($fieldName, ClassMetadata $class, AbstractPlatform $platform): string
{
if (isset($class->fieldMappings[$fieldName]['quoted'])) {
return $platform->quoteIdentifier($class->fieldMappings[$fieldName]['columnName']);
Expand All @@ -42,7 +44,7 @@ public function getColumnName($fieldName, ClassMetadata $class, AbstractPlatform
/**
* {@inheritdoc}
*/
public function getTableName(ClassMetadata $class, AbstractPlatform $platform)
public function getTableName(ClassMetadata $class, AbstractPlatform $platform): string
{
if (isset($class->table['quoted'])) {
return $platform->quoteIdentifier($class->table['name']);
Expand All @@ -58,7 +60,7 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform)
/**
* {@inheritdoc}
*/
public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform)
public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform): string
{
if (isset($definition['quoted'])) {
return $platform->quoteIdentifier($class->table['name']);
Expand All @@ -74,7 +76,7 @@ public function getSequenceName(array $definition, ClassMetadata $class, Abstrac
/**
* {@inheritdoc}
*/
public function getJoinColumnName(array $joinColumn, ClassMetadata $class, AbstractPlatform $platform)
public function getJoinColumnName(array|JoinColumnMapping $joinColumn, ClassMetadata $class, AbstractPlatform $platform): string
{
if (isset($joinColumn['quoted'])) {
return $platform->quoteIdentifier($joinColumn['name']);
Expand All @@ -90,7 +92,7 @@ public function getJoinColumnName(array $joinColumn, ClassMetadata $class, Abstr
/**
* {@inheritdoc}
*/
public function getReferencedJoinColumnName(array $joinColumn, ClassMetadata $class, AbstractPlatform $platform)
public function getReferencedJoinColumnName(array|JoinColumnMapping $joinColumn, ClassMetadata $class, AbstractPlatform $platform): string
{
if (isset($joinColumn['quoted'])) {
return $platform->quoteIdentifier($joinColumn['referencedColumnName']);
Expand All @@ -106,7 +108,7 @@ public function getReferencedJoinColumnName(array $joinColumn, ClassMetadata $cl
/**
* {@inheritdoc}
*/
public function getJoinTableName(array $association, ClassMetadata $class, AbstractPlatform $platform)
public function getJoinTableName(array|ManyToManyOwningSideMapping $association, ClassMetadata $class, AbstractPlatform $platform): string
{
if (isset($association['joinTable']['quoted'])) {
return $platform->quoteIdentifier($association['joinTable']['name']);
Expand All @@ -122,7 +124,7 @@ public function getJoinTableName(array $association, ClassMetadata $class, Abstr
/**
* {@inheritdoc}
*/
public function getIdentifierColumnNames(ClassMetadata $class, AbstractPlatform $platform)
public function getIdentifierColumnNames(ClassMetadata $class, AbstractPlatform $platform): array
{
$quotedColumnNames = array();

Expand Down Expand Up @@ -159,7 +161,7 @@ function ($joinColumn) use ($platform) {
/**
* {@inheritdoc}
*/
public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null)
public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null): string
{
// 1 ) Concatenate column name and counter
// 2 ) Trim the column alias to the maximum identifier length of the platform.
Expand Down
5 changes: 3 additions & 2 deletions app/Audit/AuditEventListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
*/
class AuditEventListener {

public function onFlush(OnFlushEventArgs $eventArgs) {
$em = $eventArgs->getEntityManager();
public function onFlush(OnFlushEventArgs $eventArgs): void
{
$em = $eventArgs->getObjectManager();
$uow = $em->getUnitOfWork();

$strategy = new AuditLogStrategy($em);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
use App\Models\Foundation\Summit\AllowedCurrencies;
use App\Models\Foundation\Summit\ScheduleEntity;
use App\Models\Utils\Traits\FinancialTrait;
use Doctrine\Persistence\Event\LifecycleEventArgs;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Log;
use models\exceptions\ValidationException;
use models\utils\SilverstripeBaseModel;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Mapping AS ORM;

/**
Expand Down
10 changes: 4 additions & 6 deletions app/Models/Foundation/Summit/ScheduleEntity.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private function _getSummitId(): int
return 0;
}

#[ORM\PreRemove] // :
#[ORM\PreRemove]
public function deleting($args)
{
Event::dispatch(new ScheduleEntityLifeCycleEvent('DELETE',
Expand All @@ -65,21 +65,19 @@ public function deleting($args)
$this->_getClassName()));
}

/**
* @ORM\preRemove:
*/
#[ORM\PostRemove]
public function deleted($args)
{
$this->cachedDeleted($args);
}

#[ORM\PreUpdate] // :
#[ORM\PreUpdate]
public function updating(PreUpdateEventArgs $args)
{
parent::updating($args);
}

#[ORM\PostUpdate] // :
#[ORM\PostUpdate]
public function updated($args)
{
Log::debug(sprintf("ScheduleEntity::updated id %s", $this->id));
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Utils/PreRemoveEventArgs.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
**/

use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\Persistence\Event\LifecycleEventArgs;

/**
* Class PreRemoveEventArgs
Expand Down
37 changes: 20 additions & 17 deletions app/Repositories/DoctrineRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@

use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\LazyCriteriaCollection;
use Doctrine\ORM\NativeQuery;
use Doctrine\ORM\Query;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Doctrine\ORM\QueryBuilder;
use Doctrine\ORM\Tools\Pagination\Paginator;
use Doctrine\Common\Collections\AbstractLazyCollection;
use Doctrine\Common\Collections\Selectable;
use Illuminate\Support\Facades\Log;
use LaravelDoctrine\ORM\Facades\Registry;
use models\utils\IBaseRepository;
Expand All @@ -45,7 +48,7 @@ abstract class DoctrineRepository extends EntityRepository implements IBaseRepos
/**
* @return EntityManager
*/
protected function getEntityManager()
protected function getEntityManager():EntityManagerInterface
{
return Registry::getManager($this->manager_name);
}
Expand Down Expand Up @@ -341,11 +344,11 @@ public function getAllIdsByPage(PagingInfo $paging_info, Filter $filter = null,
*
* @return QueryBuilder
*/
public function createQueryBuilder($alias, $indexBy = null)
public function createQueryBuilder($alias, $indexBy = null): QueryBuilder
{
return $this->getEntityManager()->createQueryBuilder()
->select($alias)
->from($this->_entityName, $alias, $indexBy);
->from($this->getEntityName(), $alias, $indexBy);
}

/**
Expand All @@ -357,10 +360,10 @@ public function createQueryBuilder($alias, $indexBy = null)
*
* @return ResultSetMappingBuilder
*/
public function createResultSetMappingBuilder($alias)
public function createResultSetMappingBuilder($alias): ResultSetMappingBuilder
{
$rsm = new ResultSetMappingBuilder($this->getEntityManager(), ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT);
$rsm->addRootEntityFromClassMetadata($this->_entityName, $alias);
$rsm->addRootEntityFromClassMetadata($this->getEntityName(), $alias);

return $rsm;
}
Expand Down Expand Up @@ -414,10 +417,10 @@ public function clear()
*
* @return object|null The entity instance or NULL if the entity can not be found.
*/
public function find($id, $lockMode = null, $lockVersion = null, $refresh = false)
public function find($id, $lockMode = null, $lockVersion = null, $refresh = false): ?object
{
$em = $this->getEntityManager();
$res = $em->find($this->_entityName, $id, $lockMode, $lockVersion);
$res = $em->find($this->getEntityName(), $id, $lockMode, $lockVersion);
if($refresh)
$em->refresh($res);
return $res;
Expand All @@ -433,9 +436,9 @@ public function find($id, $lockMode = null, $lockVersion = null, $refresh = fals
*
* @return array The objects.
*/
public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
{
$persister = $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->_entityName);
$persister = $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->getEntityName());

return $persister->loadAll($criteria, $orderBy, $limit, $offset);
}
Expand All @@ -448,9 +451,9 @@ public function findBy(array $criteria, array $orderBy = null, $limit = null, $o
*
* @return object|null The entity instance or NULL if the entity can not be found.
*/
public function findOneBy(array $criteria, array $orderBy = null)
public function findOneBy(array $criteria, array $orderBy = null): ?object
{
$persister = $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->_entityName);
$persister = $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->getEntityName());

return $persister->load($criteria, null, null, [], null, 1, $orderBy);
}
Expand All @@ -464,22 +467,22 @@ public function findOneBy(array $criteria, array $orderBy = null)
*
* @return int The cardinality of the objects that match the given criteria.
*/
public function count(array $criteria)
public function count(array $criteria = []): int
{
return $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->_entityName)->count($criteria);
return $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->getEntityName())->count($criteria);
}

/**
* Select all elements from a selectable that match the expression and
* return a new collection containing these elements.
*
* @param \Doctrine\Common\Collections\Criteria $criteria
* @param Criteria $criteria
*
* @return \Doctrine\Common\Collections\Collection
* @return AbstractLazyCollection&Selectable
*/
public function matching(Criteria $criteria)
public function matching(Criteria $criteria): AbstractLazyCollection&Selectable
{
$persister = $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->_entityName);
$persister = $this->getEntityManager()->getUnitOfWork()->getEntityPersister($this->getEntityName());

return new LazyCriteriaCollection($persister, $criteria);
}
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^8.2",
"php": "^8.3",
"ext-gd": "*",
"ext-imagick": "*",
"ext-json": "*",
"ext-openssl": "*",
"ext-pdo": "*",
"ext-zlib": "*",
"laravel/framework": "11.44.1",
"laravel/framework": "12.1.1",
"laravel/helpers": "^1.7.0",
"laravel/tinker": "2.9.0",
"laravel-doctrine/orm": "2.1.0",
"laravel-doctrine/extensions": "1.7.0",
"laravel-doctrine/migrations": "3.2.0",
"laravel/tinker": "2.10.1",
"laravel-doctrine/orm": "3.1.1",
"laravel-doctrine/extensions": "2.0.1",
"laravel-doctrine/migrations": "3.4.0",
"beberlei/doctrineextensions": "1.5.0",
"affinipay/chargeio-php": "dev-master",
"behat/transliterator": "^1.2",
Expand Down Expand Up @@ -48,13 +48,13 @@
"stripe/stripe-php": "^7.95.0",
"symfony/yaml": "^7.1.1",
"tecnickcom/tcpdf": "^6.2",
"vladimir-yuldashev/laravel-queue-rabbitmq": "v14.1.0",
"vladimir-yuldashev/laravel-queue-rabbitmq": "v14.2.0",
"laminas/laminas-math": "^3.7"
},
"require-dev": {
"fakerphp/faker": "^1.23",
"filp/whoops": "^2.0",
"laravel/browser-kit-testing": "7.2.0",
"laravel/browser-kit-testing": "7.2.4",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^11.0.1",
"rector/rector": "*",
Expand Down
Loading