Skip to content

Commit c04738c

Browse files
laoneolaoneo
committed
Merge commit '36e4e3080f5b4456273af08737b1782b8c24c3d4' into upmerge
2 parents bae4fc9 + 36e4e30 commit c04738c

File tree

23 files changed

+75
-75
lines changed

23 files changed

+75
-75
lines changed

‎libraries/src/Document/DocumentAwareInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Interface to be implemented by classes depending on a document.
1818
*
19-
* @since __DEPLOY_VERSION__
19+
* @since 4.4.0
2020
*/
2121
interface DocumentAwareInterface
2222
{
@@ -27,7 +27,7 @@ interface DocumentAwareInterface
2727
*
2828
* @return void
2929
*
30-
* @since __DEPLOY_VERSION__
30+
* @since 4.4.0
3131
*/
3232
public function setDocument(Document $document): void;
3333
}

‎libraries/src/Document/DocumentAwareTrait.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
/**
1717
* Defines the trait for a document aware class.
1818
*
19-
* @since __DEPLOY_VERSION__
19+
* @since 4.4.0
2020
*/
2121
trait DocumentAwareTrait
2222
{
2323
/**
2424
* Document
2525
*
2626
* @var Document
27-
* @since __DEPLOY_VERSION__
27+
* @since 4.4.0
2828
*/
2929
private $document;
3030

@@ -33,7 +33,7 @@ trait DocumentAwareTrait
3333
*
3434
* @return Document
3535
*
36-
* @since __DEPLOY_VERSION__
36+
* @since 4.4.0
3737
* @throws \UnexpectedValueException May be thrown if the document has not been set.
3838
*/
3939
protected function getDocument(): Document
@@ -52,7 +52,7 @@ protected function getDocument(): Document
5252
*
5353
* @return void
5454
*
55-
* @since __DEPLOY_VERSION__
55+
* @since 4.4.0
5656
*/
5757
public function setDocument(Document $document): void
5858
{

‎libraries/src/Factory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ public static function getDbo()
479479
* @see Mail
480480
* @since 1.7.0
481481
*
482-
* @deprecated __DEPLOY_VERSION__ will be removed in 6.0
482+
* @deprecated 4.4.0 will be removed in 6.0
483483
* Use the mailer service in the DI container and create a mailer from there
484484
* Example:
485485
* Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
@@ -698,7 +698,7 @@ protected static function createDbo()
698698
* @see Mail
699699
* @since 1.7.0
700700
*
701-
* @deprecated __DEPLOY_VERSION__ will be removed in 6.0
701+
* @deprecated 4.4.0 will be removed in 6.0
702702
* Use the mailer service in the DI container and create a mailer from there
703703
* Example:
704704
* Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();

‎libraries/src/Feed/FeedLink.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,31 @@ class FeedLink
7272
* The link of the image.
7373
*
7474
* @var integer
75-
* @since __DEPLOY_VERSION__
75+
* @since 4.4.0
7676
*/
7777
public $link;
7878

7979
/**
8080
* The description of the image.
8181
*
8282
* @var integer
83-
* @since __DEPLOY_VERSION__
83+
* @since 4.4.0
8484
*/
8585
public $description;
8686

8787
/**
8888
* The height of the image.
8989
*
9090
* @var integer
91-
* @since __DEPLOY_VERSION__
91+
* @since 4.4.0
9292
*/
9393
public $height;
9494

9595
/**
9696
* The width of the image.
9797
*
9898
* @var integer
99-
* @since __DEPLOY_VERSION__
99+
* @since 4.4.0
100100
*/
101101
public $width;
102102

‎libraries/src/Language/LanguageAwareInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Interface to be implemented by classes depending on a language.
1818
*
19-
* @since __DEPLOY_VERSION__
19+
* @since 4.4.0
2020
*/
2121
interface LanguageAwareInterface
2222
{
@@ -27,7 +27,7 @@ interface LanguageAwareInterface
2727
*
2828
* @return void
2929
*
30-
* @since __DEPLOY_VERSION__
30+
* @since 4.4.0
3131
*/
3232
public function setLanguage(Language $language): void;
3333
}

‎libraries/src/Language/LanguageAwareTrait.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
/**
1717
* Defines the trait for a language aware class.
1818
*
19-
* @since __DEPLOY_VERSION__
19+
* @since 4.4.0
2020
*/
2121
trait LanguageAwareTrait
2222
{
2323
/**
2424
* Language
2525
*
2626
* @var Language
27-
* @since __DEPLOY_VERSION__
27+
* @since 4.4.0
2828
*/
2929
private $language;
3030

@@ -33,7 +33,7 @@ trait LanguageAwareTrait
3333
*
3434
* @return Language
3535
*
36-
* @since __DEPLOY_VERSION__
36+
* @since 4.4.0
3737
* @throws \UnexpectedValueException May be thrown if the language has not been set.
3838
*/
3939
protected function getLanguage(): Language
@@ -52,7 +52,7 @@ protected function getLanguage(): Language
5252
*
5353
* @return void
5454
*
55-
* @since __DEPLOY_VERSION__
55+
* @since 4.4.0
5656
*/
5757
public function setLanguage(Language $language): void
5858
{

‎libraries/src/MVC/Factory/MVCFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ private function setUserFactoryOnObject($object): void
404404
*
405405
* @return void
406406
*
407-
* @since __DEPLOY_VERSION__
407+
* @since 4.4.0
408408
*/
409409
private function setMailerFactoryOnObject($object): void
410410
{

‎libraries/src/MVC/View/AbstractView.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ abstract class AbstractView extends CMSObject implements ViewInterface, Dispatch
4444
* @var Document
4545
* @since 3.0
4646
*
47-
* @deprecated __DEPLOY_VERSION__ will be removed in 6.0
47+
* @deprecated 4.4.0 will be removed in 6.0
4848
* Use $this->getDocument() instead
4949
*/
5050
public $document;
@@ -246,7 +246,7 @@ public function getName()
246246
*
247247
* @return Document
248248
*
249-
* @since __DEPLOY_VERSION__
249+
* @since 4.4.0
250250
* @throws \UnexpectedValueException May be thrown if the document has not been set.
251251
*/
252252
protected function getDocument(): Document
@@ -265,7 +265,7 @@ protected function getDocument(): Document
265265
*
266266
* @return void
267267
*
268-
* @since __DEPLOY_VERSION__
268+
* @since 4.4.0
269269
*/
270270
public function setDocument(Document $document): void
271271
{
@@ -297,7 +297,7 @@ protected function dispatchEvent(EventInterface $event)
297297
*
298298
* @return string
299299
*
300-
* @since __DEPLOY_VERSION__
300+
* @since 4.4.0
301301
*/
302302
protected function _(string $key): string
303303
{

‎libraries/src/Mail/Mail.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Mail extends PHPMailer implements MailerInterface
3333
* @var Mail[]
3434
* @since 1.7.3
3535
*
36-
* @deprecated __DEPLOY_VERSION__ will be removed in 6.0
36+
* @deprecated 4.4.0 will be removed in 6.0
3737
* See getInstance() for more details
3838
*/
3939
public static $instances = [];
@@ -103,9 +103,9 @@ public function __construct($exceptions = true)
103103
*
104104
* @return Mail The global Mail object
105105
*
106-
* @since __DEPLOY_VERSION__
106+
* @since 4.4.0
107107
*
108-
* @deprecated __DEPLOY_VERSION__ will be removed in 6.0
108+
* @deprecated 4.4.0 will be removed in 6.0
109109
* Use the mailer service in the DI container and create a mailer from there
110110
* Example:
111111
* Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();

‎libraries/src/Mail/MailerFactory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
/**
2121
* Default factory for creating mailer objects.
2222
*
23-
* @since __DEPLOY_VERSION__
23+
* @since 4.4.0
2424
*/
2525
class MailerFactory implements MailerFactoryInterface
2626
{
2727
/**
2828
* The default configuration.
2929
*
3030
* @var Registry
31-
* @since __DEPLOY_VERSION__
31+
* @since 4.4.0
3232
*/
3333
private $defaultConfiguration;
3434

@@ -50,7 +50,7 @@ public function __construct(Registry $defaultConfiguration)
5050
*
5151
* @return MailerInterface
5252
*
53-
* @since __DEPLOY_VERSION__
53+
* @since 4.4.0
5454
*/
5555
public function createMailer(?Registry $settings = null): MailerInterface
5656
{

0 commit comments

Comments
 (0)