Merge adjustments

Removes changes to autogenerated files and fixes missing Exception class usages in migrations.
neos · Jul 6, 2024 · ee54f74 · ee54f74
1 parent 7a4a017
commit ee54f74
Show file tree

Hide file tree

Showing 24 changed files with 21 additions and 68 deletions.
diff --git a/Neos.Media/Migrations/Mysql/Version20181104152203.php b/Neos.Media/Migrations/Mysql/Version20181104152203.php
@@ -11,8 +11,7 @@
  * source code.
  */
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -31,7 +30,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -45,7 +43,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Mysql/Version20190314150744.php b/Neos.Media/Migrations/Mysql/Version20190314150744.php
@@ -22,7 +22,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Exception
-     * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -42,7 +41,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Exception
-     * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Mysql/Version20190315122900.php b/Neos.Media/Migrations/Mysql/Version20190315122900.php
@@ -22,7 +22,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Exception
-     * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -34,7 +33,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Exception
-     * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Mysql/Version20191125132700.php b/Neos.Media/Migrations/Mysql/Version20191125132700.php
@@ -3,8 +3,7 @@
 
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 
@@ -26,7 +25,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -38,7 +36,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Mysql/Version20200306233229.php b/Neos.Media/Migrations/Mysql/Version20200306233229.php
@@ -5,7 +5,6 @@
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
 
 class Version20200306233229 extends AbstractMigration
 {
@@ -21,7 +20,6 @@ public function getDescription(): string
     /**
      * @param Schema $schema
      * @return void
-     * @throws AbortMigrationException
      * @throws \Doctrine\DBAL\Exception
      */
     public function up(Schema $schema): void
@@ -37,7 +35,6 @@ public function up(Schema $schema): void
     /**
      * @param Schema $schema
      * @return void
-     * @throws AbortMigrationException
      * @throws \Doctrine\DBAL\Exception
      */
     public function down(Schema $schema): void

diff --git a/Neos.Media/Migrations/Mysql/Version20200823164700.php b/Neos.Media/Migrations/Mysql/Version20200823164700.php
@@ -3,8 +3,7 @@
 
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -29,7 +28,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -48,7 +46,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Mysql/Version20200828170100.php b/Neos.Media/Migrations/Mysql/Version20200828170100.php
@@ -3,8 +3,7 @@
 
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -25,7 +24,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -39,7 +37,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Postgresql/Version20181104152204.php b/Neos.Media/Migrations/Postgresql/Version20181104152204.php
@@ -11,8 +11,7 @@
  * source code.
  */
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -31,7 +30,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -45,7 +43,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Postgresql/Version20190314150745.php b/Neos.Media/Migrations/Postgresql/Version20190314150745.php
@@ -22,7 +22,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Exception
-     * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -44,7 +43,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Exception
-     * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Postgresql/Version20190315122901.php b/Neos.Media/Migrations/Postgresql/Version20190315122901.php
@@ -1,8 +1,7 @@
 <?php
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -24,7 +23,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -36,7 +34,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Postgresql/Version20191125132701.php b/Neos.Media/Migrations/Postgresql/Version20191125132701.php
@@ -3,8 +3,7 @@
 
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 
@@ -26,7 +25,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -38,7 +36,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Postgresql/Version20200307122055.php b/Neos.Media/Migrations/Postgresql/Version20200307122055.php
@@ -4,7 +4,6 @@
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
 
 class Version20200307122055 extends AbstractMigration
 {
@@ -20,7 +19,6 @@ public function getDescription(): string
     /**
      * @param Schema $schema
      * @return void
-     * @throws AbortMigrationException
      * @throws \Doctrine\DBAL\Exception
      */
     public function up(Schema $schema): void
@@ -36,7 +34,6 @@ public function up(Schema $schema): void
     /**
      * @param Schema $schema
      * @return void
-     * @throws AbortMigrationException
      * @throws \Doctrine\DBAL\Exception
      */
     public function down(Schema $schema): void

diff --git a/Neos.Media/Migrations/Postgresql/Version20200823164701.php b/Neos.Media/Migrations/Postgresql/Version20200823164701.php
@@ -3,8 +3,7 @@
 
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -29,7 +28,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -48,7 +46,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Media/Migrations/Postgresql/Version20200828170101.php b/Neos.Media/Migrations/Postgresql/Version20200828170101.php
@@ -3,8 +3,7 @@
 
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -25,7 +24,6 @@ public function getDescription(): string
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function up(Schema $schema): void
     {
@@ -39,7 +37,6 @@ public function up(Schema $schema): void
      * @param Schema $schema
      * @return void
      * @throws DBALException
-     * @throws AbortMigrationException
      */
     public function down(Schema $schema): void
     {

diff --git a/Neos.Neos/Documentation/References/EelHelpersReference.rst b/Neos.Neos/Documentation/References/EelHelpersReference.rst
@@ -3,7 +3,7 @@
 Eel Helpers Reference
 =====================
 
-This reference was automatically generated from code on 2024-06-11
+This reference was automatically generated from code on 2024-05-14
 
 
 .. _`Eel Helpers Reference: Array`:

diff --git a/Neos.Neos/Documentation/References/FlowQueryOperationReference.rst b/Neos.Neos/Documentation/References/FlowQueryOperationReference.rst
@@ -3,7 +3,7 @@
 FlowQuery Operation Reference
 =============================
 
-This reference was automatically generated from code on 2024-06-11
+This reference was automatically generated from code on 2024-05-14
 
 
 .. _`FlowQuery Operation Reference: add`:

diff --git a/Neos.Neos/Documentation/References/PropertyEditorReference.rst b/Neos.Neos/Documentation/References/PropertyEditorReference.rst
@@ -92,20 +92,12 @@ In case the text input should span multiple lines, a ``TextAreaEditor`` should b
             group: 'document'
             editor: 'Neos.Neos/Inspector/Editors/TextAreaEditor'
             editorOptions:
-              minRows: 5
-              expandedRows: 10
-              maxRows: 20
+              rows: 7
 
 Options Reference:
 
-``minRows`` (integer)
-	Optional number to set the minRows of the TextArea if not expanded; Default ``2``.
-
-``maxRows`` (integer)
-	Optional number to set the maxRows of the TextArea if expanded; Default ``24``.
-
-``expandedRows`` (integer)
-	Optional number to set the expandedRows of the TextArea if expanded; Default ``6``.
+``rows`` (integer)
+	Number of lines this textarea should have; Default ``5``.
 
 ** and all options from Text Field Editor -- see above**
 

diff --git a/Neos.Neos/Documentation/References/Signals/Flow.rst b/Neos.Neos/Documentation/References/Signals/Flow.rst
@@ -3,7 +3,7 @@
 Flow Signals Reference
 ======================
 
-This reference was automatically generated from code on 2024-06-11
+This reference was automatically generated from code on 2024-05-14
 
 
 .. _`Flow Signals Reference: AbstractAdvice (``Neos\Flow\Aop\Advice\AbstractAdvice``)`:

diff --git a/Neos.Neos/Documentation/References/Signals/Media.rst b/Neos.Neos/Documentation/References/Signals/Media.rst
@@ -3,7 +3,7 @@
 Media Signals Reference
 =======================
 
-This reference was automatically generated from code on 2024-06-11
+This reference was automatically generated from code on 2024-05-14
 
 
 .. _`Media Signals Reference: AssetCollectionController (``Neos\Media\Browser\Controller\AssetCollectionController``)`:

diff --git a/Neos.Neos/Documentation/References/Signals/Neos.rst b/Neos.Neos/Documentation/References/Signals/Neos.rst
@@ -3,7 +3,7 @@
 Neos Signals Reference
 ======================
 
-This reference was automatically generated from code on 2024-06-11
+This reference was automatically generated from code on 2024-05-14
 
 
 .. _`Neos Signals Reference: AbstractModuleController (``Neos\Neos\Controller\Module\AbstractModuleController``)`: