Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed zend framework bridge. #2270

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Removed zend framework bridge. #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42fccb4
Removed zend framework bridge.
Mar 10, 2025
fed0460
Updated doctrine orm config and replaced deprecated doctrine cache by…
Mar 10, 2025
39266e7
Updated entities to support doctrine annotations with namespace ORM.
Mar 10, 2025
2e34e91
Updated overridden AbstractProxyFactory to not use "require" any file.
Mar 10, 2025
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
1 change: 0 additions & 1 deletion application/config/application.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
'Laminas\Mvc\Plugin\Identity',
'Laminas\Navigation',
'Laminas\Router',
'Laminas\ZendFrameworkBridge',
'Omeka',
],
'module_listener_options' => [
Expand Down
6 changes: 3 additions & 3 deletions application/data/doctrine-proxies/__CG__OmekaEntityApiKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -327,7 +327,7 @@ public function getCreated()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand Down
6 changes: 3 additions & 3 deletions application/data/doctrine-proxies/__CG__OmekaEntityAsset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -195,7 +195,7 @@ public function getId()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand Down
6 changes: 3 additions & 3 deletions application/data/doctrine-proxies/__CG__OmekaEntityFulltextSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -210,7 +210,7 @@ public function getResource()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand Down
14 changes: 7 additions & 7 deletions application/data/doctrine-proxies/__CG__OmekaEntityItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -206,7 +206,7 @@ public function getId()
/**
* {@inheritDoc}
*/
public function setPrimaryMedia(\Omeka\Entity\Media $primaryMedia = NULL)
public function setPrimaryMedia(?\Omeka\Entity\Media $primaryMedia = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setPrimaryMedia', [$primaryMedia]);
Expand Down Expand Up @@ -272,7 +272,7 @@ public function getSites()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand All @@ -294,7 +294,7 @@ public function getOwner()
/**
* {@inheritDoc}
*/
public function setResourceClass(\Omeka\Entity\ResourceClass $resourceClass = NULL)
public function setResourceClass(?\Omeka\Entity\ResourceClass $resourceClass = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setResourceClass', [$resourceClass]);
Expand All @@ -316,7 +316,7 @@ public function getResourceClass()
/**
* {@inheritDoc}
*/
public function setResourceTemplate(\Omeka\Entity\ResourceTemplate $resourceTemplate = NULL)
public function setResourceTemplate(?\Omeka\Entity\ResourceTemplate $resourceTemplate = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setResourceTemplate', [$resourceTemplate]);
Expand All @@ -338,7 +338,7 @@ public function getResourceTemplate()
/**
* {@inheritDoc}
*/
public function setThumbnail(\Omeka\Entity\Asset $thumbnail = NULL)
public function setThumbnail(?\Omeka\Entity\Asset $thumbnail = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setThumbnail', [$thumbnail]);
Expand Down
12 changes: 6 additions & 6 deletions application/data/doctrine-proxies/__CG__OmekaEntityItemSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -250,7 +250,7 @@ public function getSiteItemSets()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand All @@ -272,7 +272,7 @@ public function getOwner()
/**
* {@inheritDoc}
*/
public function setResourceClass(\Omeka\Entity\ResourceClass $resourceClass = NULL)
public function setResourceClass(?\Omeka\Entity\ResourceClass $resourceClass = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setResourceClass', [$resourceClass]);
Expand All @@ -294,7 +294,7 @@ public function getResourceClass()
/**
* {@inheritDoc}
*/
public function setResourceTemplate(\Omeka\Entity\ResourceTemplate $resourceTemplate = NULL)
public function setResourceTemplate(?\Omeka\Entity\ResourceTemplate $resourceTemplate = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setResourceTemplate', [$resourceTemplate]);
Expand All @@ -316,7 +316,7 @@ public function getResourceTemplate()
/**
* {@inheritDoc}
*/
public function setThumbnail(\Omeka\Entity\Asset $thumbnail = NULL)
public function setThumbnail(?\Omeka\Entity\Asset $thumbnail = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setThumbnail', [$thumbnail]);
Expand Down
6 changes: 3 additions & 3 deletions application/data/doctrine-proxies/__CG__OmekaEntityJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -316,7 +316,7 @@ public function getLog()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand Down
14 changes: 7 additions & 7 deletions application/data/doctrine-proxies/__CG__OmekaEntityMedia.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -481,7 +481,7 @@ public function getPosition()
/**
* {@inheritDoc}
*/
public function setItem(\Omeka\Entity\Item $item = NULL)
public function setItem(?\Omeka\Entity\Item $item = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setItem', [$item]);
Expand Down Expand Up @@ -547,7 +547,7 @@ public function getAltText()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand All @@ -569,7 +569,7 @@ public function getOwner()
/**
* {@inheritDoc}
*/
public function setResourceClass(\Omeka\Entity\ResourceClass $resourceClass = NULL)
public function setResourceClass(?\Omeka\Entity\ResourceClass $resourceClass = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setResourceClass', [$resourceClass]);
Expand All @@ -591,7 +591,7 @@ public function getResourceClass()
/**
* {@inheritDoc}
*/
public function setResourceTemplate(\Omeka\Entity\ResourceTemplate $resourceTemplate = NULL)
public function setResourceTemplate(?\Omeka\Entity\ResourceTemplate $resourceTemplate = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setResourceTemplate', [$resourceTemplate]);
Expand All @@ -613,7 +613,7 @@ public function getResourceTemplate()
/**
* {@inheritDoc}
*/
public function setThumbnail(\Omeka\Entity\Asset $thumbnail = NULL)
public function setThumbnail(?\Omeka\Entity\Asset $thumbnail = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setThumbnail', [$thumbnail]);
Expand Down
4 changes: 2 additions & 2 deletions application/data/doctrine-proxies/__CG__OmekaEntityMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down
4 changes: 2 additions & 2 deletions application/data/doctrine-proxies/__CG__OmekaEntityModule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down
4 changes: 2 additions & 2 deletions application/data/doctrine-proxies/__CG__OmekaEntityPasswordCreation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down
8 changes: 4 additions & 4 deletions application/data/doctrine-proxies/__CG__OmekaEntityProperty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __setInitialized($initialized): void
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
public function __setInitializer(?\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
Expand All @@ -151,7 +151,7 @@ public function __getInitializer(): ?\Closure
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
public function __setCloner(?\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
Expand Down Expand Up @@ -195,7 +195,7 @@ public function getId()
/**
* {@inheritDoc}
*/
public function setOwner(\Omeka\Entity\User $owner = NULL)
public function setOwner(?\Omeka\Entity\User $owner = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setOwner', [$owner]);
Expand All @@ -217,7 +217,7 @@ public function getOwner()
/**
* {@inheritDoc}
*/
public function setVocabulary(\Omeka\Entity\Vocabulary $vocabulary = NULL)
public function setVocabulary(?\Omeka\Entity\Vocabulary $vocabulary = NULL)
{

$this->__initializer__ && $this->__initializer__->__invoke($this, 'setVocabulary', [$vocabulary]);
Expand Down
Loading