adjust from dantleech

dbu · dbu · commit 7a83409f16f0 · 2024-03-18T15:25:56.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,15 +4,17 @@ on:
     pull_request:
     push:
         branches:
-            - 'master'
+        - '[0-9]+.x'
+        - '[0-9]+.[0-9]+'
+        - '[0-9]+.[0-9]+.x'
 
 jobs:
     php:
         name: "PHP ${{ matrix.php-version }}"
         runs-on: ubuntu-latest
 
         env:
-            KERNEL_CLASS: DTL\Bundle\PhpcrMigrations\Tests\Resources\App\AppKernel
+            KERNEL_CLASS: PHPCR\PhpcrMigrationsBundle\Tests\Resources\App\AppKernel
 
         strategy:
             fail-fast: false
@@ -40,7 +42,7 @@ jobs:
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install and configure PHP
               uses: shivammathur/setup-php@v2
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
-Tests/Resources/app/cache
-Tests/Resources/app/logs
+tests/Resources/App/var
 composer.lock
 vendor
 .phpunit.result.cache
-Tests/Resources/App/var/cache
-Tests/Resources/App/var/logs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,9 @@
 CHANGELOG
 =========
 
-1.3.0
+1.4.0
 -----
 
-- Support Symfony 6
-- Drop Support for PHP <= 7.1 and Symfony <= 4.3
+Initial release after renaming from `dantleech/phpcr-migrations-bundle` to `phpcr/phpcr-migrations-bundle`.
 
-1.2.0
------
-
-- Support Symfony 5
+Adjusted namespaces to match PHPCR.
diff --git a/README.md b/README.md
@@ -2,20 +2,23 @@ PHPCR Migrations Bundle
 =======================
 
 This library provides a Symfony integration for the [PHPCR migrations
-library](https://github.com/dantleech/phpcr-migrations).
+library](https://github.com/phpcr/phpcr-migrations).
+
+It has initially been created by  Daniel Leech as `dantleech/phpcr-migrations-bundle` and was then
+donated to the PHPCR organization.
 
 Configuration
 -------------
 
 Configure the path to your migrations:
 
 ````yaml
-# app/config.yml
+# config/packages/phpcr-migrations.yaml
 phpcr_migrations:
-    paths: [%kernel.root_dir%/phpcr-migrations]
+    paths: [%kernel.project_dir%/phpcr-migrations]
 ````
 
-Or the bundle will automatically pick up any migrations in the
+And the bundle will automatically pick up any migrations in the
 `Resources/phpcr-migrations` folder in any bundles registered in the kernel.
 
 Creating migrations
@@ -25,19 +28,19 @@ First create two new migration files:
 
 ````php
 <?php
-// app/phpcr-migrations/Version201501011200.php
+// phpcr-migrations/Version201501011200.php
 
 use PHPCR\SessionInterface;
 use PHPCR\Migrations\VersionInterface;
 
 class Version201501011200 implements VersionInterface
 {
-    public function up(SessionInterface $session)
+    public function up(SessionInterface $session): void
     {
         $session->getRootNode()->addNode('hello');
     }
 
-    public function down(SessionInterface $session)
+    public function down(SessionInterface $session): void
     {
         $session->getRootNode()->getNode('hello')->remove();
     }
@@ -55,12 +58,12 @@ use PHPCR\Migrations\VersionInterface;
 
 class Version201501011212 implements VersionInterface
 {
-    public function up(SessionInterface $session)
+    public function up(SessionInterface $session): void
     {
         $session->getNode('/hello')->addNode('world');
     }
 
-    public function down(SessionInterface $session)
+    public function down(SessionInterface $session): void
     {
         $session->getNode('/hello')->getNode('world')->remove();
     }
@@ -99,7 +102,7 @@ Upgrading 2 version(s):
  + [2/2]: 201501011212
 ````
 
-This should run the two migrations, your status should not look like this:
+This should run the two migrations.
 
 Reverting
 ---------
@@ -129,4 +132,3 @@ Actions are:
 - `down`: Revert one version
 - `top`: Migrate to the latest version
 - `bottom`: Revert all migrations
-
diff --git a/Resources/docs/index.rst b/Resources/docs/index.rst
diff --git a/composer.json b/composer.json
@@ -1,11 +1,15 @@
 {
-    "name": "dantleech/phpcr-migrations-bundle",
+    "name": "phpcr/phpcr-migrations-bundle",
     "description": "PHPCR migrations bundle",
     "license": "MIT",
     "authors": [
         {
             "name": "Daniel Leech",
             "email": "daniel@dantleech.com"
+        },
+        {
+            "name": "David Buchmann",
+            "email": "mail@davidbu.ch"
         }
     ],
     "require": {
@@ -31,12 +35,12 @@
     },
     "autoload": {
         "psr-4": {
-            "DTL\\Bundle\\PhpcrMigrations\\": "."
+            "PHPCR\\PhpcrMigrationsBundle\\": "src/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
+    "autoload-dev": {
+        "psr-4": {
+            "PHPCR\\PhpcrMigrationsBundle\\Tests\\": "tests/"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,23 +6,12 @@
 
     <testsuites>
         <testsuite name="PHPCR migrations Bundle">
-            <directory>./Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>.</directory>
-            <exclude>
-                <directory>Resources/</directory>
-                <directory>Tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
     <php>
-        <env name="KERNEL_CLASS" value="DTL\Bundle\PhpcrMigrations\Tests\Resources\App\AppKernel" />
+        <env name="KERNEL_CLASS" value="PHPCR\PhpcrMigrationsBundle\Tests\Resources\App\AppKernel" />
         <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
     </php>
diff --git a/src/Command/InitializeCommand.php b/src/Command/InitializeCommand.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Command;
+namespace PHPCR\PhpcrMigrationsBundle\Command;
 
 use PHPCR\Migrations\MigratorFactory;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Command/MigrateCommand.php b/src/Command/MigrateCommand.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Command;
+namespace PHPCR\PhpcrMigrationsBundle\Command;
 
 use PHPCR\Migrations\MigratorFactory;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Command/StatusCommand.php b/src/Command/StatusCommand.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Command;
+namespace PHPCR\PhpcrMigrationsBundle\Command;
 
 use PHPCR\Migrations\VersionFinder;
 use PHPCR\Migrations\VersionStorage;
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\DependencyInjection;
+namespace PHPCR\PhpcrMigrationsBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
diff --git a/src/DependencyInjection/PhpcrMigrationsExtension.php b/src/DependencyInjection/PhpcrMigrationsExtension.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\DependencyInjection;
+namespace PHPCR\PhpcrMigrationsBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/PhpcrMigrationsBundle.php b/src/PhpcrMigrationsBundle.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations;
+namespace PHPCR\PhpcrMigrationsBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -19,19 +19,19 @@
             <argument type="service" id="doctrine_phpcr.session" />
         </service>
 
-        <service id="phpcr_migrations.command.status" class="DTL\Bundle\PhpcrMigrations\Command\StatusCommand" public="true">
+        <service id="phpcr_migrations.command.status" class="PHPCR\PhpcrMigrationsBundle\Command\StatusCommand" public="true">
             <argument type="service" id="phpcr_migrations.version_storage" />
             <argument type="service" id="phpcr_migrations.version_finder" />
             <tag name="console.command" />
         </service>
 
-        <service id="phpcr_migrations.command.migrate" class="DTL\Bundle\PhpcrMigrations\Command\MigrateCommand" public="true">
+        <service id="phpcr_migrations.command.migrate" class="PHPCR\PhpcrMigrationsBundle\Command\MigrateCommand" public="true">
             <argument type="service" id="phpcr_migrations.migrator_factory" />
             <argument type="service" id="service_container" />
             <tag name="console.command" />
         </service>
 
-        <service id="phpcr_migrations.command.initialize" class="DTL\Bundle\PhpcrMigrations\Command\InitializeCommand" public="true">
+        <service id="phpcr_migrations.command.initialize" class="PHPCR\PhpcrMigrationsBundle\Command\InitializeCommand" public="true">
             <argument type="service" id="phpcr_migrations.migrator_factory" />
             <tag name="console.command" />
         </service>
diff --git a/tests/Functional/BaseTestCase.php b/tests/Functional/BaseTestCase.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Tests\Functional;
+namespace PHPCR\PhpcrMigrationsBundle\Tests\Functional;
 
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase as CmfBaseTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
 abstract class BaseTestCase extends CmfBaseTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->db('PHPCR')->purgeRepository();
         $this->session = $this->getContainer()->get('doctrine_phpcr.default_session');
@@ -27,7 +27,7 @@ public function setUp()
         }
     }
 
-    protected function executeCommand($serviceId, $arguments)
+    protected function executeCommand($serviceId, $arguments): CommandTester
     {
         $command = $this->getContainer()->get($serviceId);
         $tester = new CommandTester($command);
diff --git a/tests/Functional/MigrateCommandTest.php b/tests/Functional/MigrateCommandTest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Tests\Functional;
+namespace PHPCR\PhpcrMigrationsBundle\Tests\Functional;
 
 class MigrateCommandTest extends BaseTestCase
 {
     /**
      * It should migrate all the unexecuted migrators.
      */
-    public function testMigrateToLatest()
+    public function testMigrateToLatest(): void
     {
         $this->executeCommand('phpcr_migrations.command.migrate', array());
 
@@ -27,7 +27,7 @@ public function testMigrateToLatest()
     /**
      * It should upgrade to a given version.
      */
-    public function testUpgradeTo()
+    public function testUpgradeTo(): void
     {
         $tester = $this->executeCommand('phpcr_migrations.command.migrate', array('to' => '201401011300'));
         $display = $tester->getDisplay();
@@ -41,9 +41,9 @@ public function testUpgradeTo()
     /**
      * It should downgrade to a given version.
      */
-    public function testUpgradeRevertTo()
+    public function testUpgradeRevertTo(): void
     {
-        $tester = $this->executeCommand('phpcr_migrations.command.migrate', array());
+        $this->executeCommand('phpcr_migrations.command.migrate', array());
         $tester = $this->executeCommand('phpcr_migrations.command.migrate', array('to' => '201501011200'));
         $display = $tester->getDisplay();
 
diff --git a/tests/Functional/StatusCommandTest.php b/tests/Functional/StatusCommandTest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Tests\Functional;
+namespace PHPCR\PhpcrMigrationsBundle\Tests\Functional;
 
 class StatusCommandTest extends BaseTestCase
 {
     /**
      * It should list all of the migrations.
      */
-    public function testShowAll()
+    public function testShowAll(): void
     {
         $tester = $this->executeCommand('phpcr_migrations.command.status', array());
         $display = $tester->getDisplay();
@@ -27,9 +27,9 @@ public function testShowAll()
     /**
      * It should show the current version.
      */
-    public function testShowCurrentVersion()
+    public function testShowCurrentVersion(): void
     {
-        $tester = $this->executeCommand('phpcr_migrations.command.migrate', array('to' => '201501011500'));
+        $this->executeCommand('phpcr_migrations.command.migrate', array('to' => '201501011500'));
         $tester = $this->executeCommand('phpcr_migrations.command.status', array());
         $display = $tester->getDisplay();
 
diff --git a/tests/Resources/App/AppKernel.php b/tests/Resources/App/AppKernel.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Tests\Resources\App;
+namespace PHPCR\PhpcrMigrationsBundle\Tests\Resources\App;
 
-use DTL\Bundle\PhpcrMigrations\PhpcrMigrationsBundle;
-use DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\OneTestBundle\OneTestBundle;
-use DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\TwoTestBundle\TwoTestBundle;
+use PHPCR\PhpcrMigrationsBundle\PhpcrMigrationsBundle;
+use PHPCR\PhpcrMigrationsBundle\Tests\Resources\Bundle\OneTestBundle\OneTestBundle;
+use PHPCR\PhpcrMigrationsBundle\Tests\Resources\Bundle\TwoTestBundle\TwoTestBundle;
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -44,7 +44,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     protected function prepareContainer(ContainerBuilder $container)
     {
         parent::prepareContainer($container);
-        $container->setParameter('cmf_testing.bundle_fqn', 'DTL\Bundle\PhpcrMigrations\PhpcrMigrationsBundle');
+        $container->setParameter('cmf_testing.bundle_fqn', 'Phpcr\PhpcrMigrationsBundle\PhpcrMigrationsBundle');
     }
 
     protected function getKernelParameters(): array
diff --git a/tests/Resources/App/config/config.yml b/tests/Resources/App/config/config.yml
diff --git a/tests/Resources/Bundle/OneTestBundle/OneTestBundle.php b/tests/Resources/Bundle/OneTestBundle/OneTestBundle.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\OneTestBundle;
+namespace PHPCR\PhpcrMigrationsBundle\Tests\Resources\Bundle\OneTestBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/tests/Resources/Bundle/OneTestBundle/Resources/phpcr-migrations/Version201501011200.php b/tests/Resources/Bundle/OneTestBundle/Resources/phpcr-migrations/Version201501011200.php
diff --git a/tests/Resources/Bundle/OneTestBundle/Resources/phpcr-migrations/Version201501011212.php b/tests/Resources/Bundle/OneTestBundle/Resources/phpcr-migrations/Version201501011212.php
diff --git a/tests/Resources/Bundle/OneTestBundle/Resources/phpcr-migrations/Version201501011215.php b/tests/Resources/Bundle/OneTestBundle/Resources/phpcr-migrations/Version201501011215.php
diff --git a/tests/Resources/Bundle/TwoTestBundle/Resources/phpcr-migrations/Version201401011300.php b/tests/Resources/Bundle/TwoTestBundle/Resources/phpcr-migrations/Version201401011300.php
diff --git a/tests/Resources/Bundle/TwoTestBundle/Resources/phpcr-migrations/Version201501011500.php b/tests/Resources/Bundle/TwoTestBundle/Resources/phpcr-migrations/Version201501011500.php
diff --git a/tests/Resources/Bundle/TwoTestBundle/TwoTestBundle.php b/tests/Resources/Bundle/TwoTestBundle/TwoTestBundle.php

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
`1`	`1`	`{`
`2`		`- "name": "dantleech/phpcr-migrations-bundle",`
	`2`	`+ "name": "phpcr/phpcr-migrations-bundle",`
`3`	`3`	`"description": "PHPCR migrations bundle",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"authors": [`
`6`	`6`	`{`
`7`	`7`	`"name": "Daniel Leech",`
`8`	`8`	`"email": "[email protected]"`
	`9`	`+ },`
	`10`	`+ {`
	`11`	`+ "name": "David Buchmann",`
	`12`	`+ "email": "[email protected]"`
`9`	`13`	`}`
`10`	`14`	`],`
`11`	`15`	`"require": {`
`@@ -31,12 +35,12 @@`
`31`	`35`	`},`
`32`	`36`	`"autoload": {`
`33`	`37`	`"psr-4": {`
`34`		`- "DTL\\Bundle\\PhpcrMigrations\\": "."`
	`38`	`+ "PHPCR\\PhpcrMigrationsBundle\\": "src/"`
`35`	`39`	`}`
`36`	`40`	`},`
`37`		`- "extra": {`
`38`		`- "branch-alias": {`
`39`		`- "dev-master": "1.x-dev"`
	`41`	`+ "autoload-dev": {`
	`42`	`+ "psr-4": {`
	`43`	`+ "PHPCR\\PhpcrMigrationsBundle\\Tests\\": "tests/"`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`	`}`