Change versioning origin/resolution

package-health · Feb 24, 2023 · ab5faf8 · ab5faf8
1 parent 43bbb18
commit ab5faf8
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 81 deletions.
diff --git a/bin/console.php b/bin/console.php
@@ -10,6 +10,7 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
+use Composer\InstalledVersions;
 use DI\ContainerBuilder;
 use PackageHealth\PHP\Application\Console\Packagist\GetDataCommand;
 use PackageHealth\PHP\Application\Console\Packagist\GetListCommand;
@@ -27,6 +28,15 @@
   $dotenv->safeLoad();
 }
 
+define(
+  '__VERSION__',
+  sprintf(
+    '%s@%s',
+    InstalledVersions::getPrettyVersion('package-health/php'),
+    substr(InstalledVersions::getReference('package-health/php'), 0, 7)
+  )
+);
+
 // Instantiate PHP-DI ContainerBuilder
 $containerBuilder = new ContainerBuilder();
 
@@ -65,7 +75,7 @@
 $messages = require __DIR__ . '/../app/messages.php';
 $messages($container);
 
-$app = new Application('php.package.health console', $_ENV['VERSION'] ?? '');
+$app = new Application('php.package.health console', __VERSION__);
 $app->setCommandLoader(
   new FactoryCommandLoader(
     [

diff --git a/composer.json b/composer.json
@@ -38,6 +38,7 @@
     "ext-posix": "*",
     "ext-redis": "*",
     "ext-zlib": "*",
+    "composer-runtime-api": "^2",
     "badges/poser": "^2.3",
     "composer/metadata-minifier": "^1.0",
     "composer/semver": "^3.3",
@@ -54,6 +55,7 @@
     "nyholm/dsn": "^2.0",
     "nyholm/psr7": "^1.5",
     "nyholm/psr7-server": "^1.0",
+    "ocramius/package-versions": "*",
     "php-di/php-di": "^7.0",
     "phpunit/php-timer": "^6.0",
     "psr/cache": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/public/index.php b/public/index.php
@@ -1,6 +1,7 @@
 <?php
 declare(strict_types = 1);
 
+use Composer\InstalledVersions;
 use DI\ContainerBuilder;
 use PackageHealth\PHP\Application\Handler\HttpErrorHandler;
 use PackageHealth\PHP\Application\Handler\ShutdownHandler;
@@ -16,6 +17,15 @@
   $dotenv->safeLoad();
 }
 
+define(
+  '__VERSION__',
+  sprintf(
+    '%s@%s',
+    InstalledVersions::getPrettyVersion('package-health/php'),
+    substr(InstalledVersions::getReference('package-health/php'), 0, 7)
+  )
+);
+
 // Instantiate PHP-DI ContainerBuilder
 $containerBuilder = new ContainerBuilder();
 

diff --git a/src/Application/Action/Package/ListPackageVersionsAction.php b/src/Application/Action/Package/ListPackageVersionsAction.php
@@ -93,7 +93,7 @@ static function (Version $version): DateTimeImmutable {
           ],
           'app' => [
             'canonicalUrl' => (string)$this->request->getUri(),
-            'version'      => $_ENV['VERSION']
+            'version'      => __VERSION__
           ]
         ]
       );

diff --git a/src/Application/Action/Package/ListPackagesAction.php b/src/Application/Action/Package/ListPackagesAction.php
@@ -38,7 +38,7 @@ static function (Package $package): DateTimeImmutable {
           ],
           'app' => [
             'canonicalUrl' => (string)$this->request->getUri(),
-            'version'      => $_ENV['VERSION']
+            'version'      => __VERSION__
           ]
         ]
       );

diff --git a/src/Application/Action/Package/RedirectPackageVersionAction.php b/src/Application/Action/Package/RedirectPackageVersionAction.php
@@ -119,7 +119,7 @@ static function (Version $version): bool {
               ],
               'app' => [
                 'canonicalUrl' => (string)$this->request->getUri(),
-                'version'      => $_ENV['VERSION']
+                'version'      => __VERSION__
               ]
             ]
           )

diff --git a/src/Application/Action/Package/ViewPackageVersionAction.php b/src/Application/Action/Package/ViewPackageVersionAction.php
@@ -120,7 +120,7 @@ protected function action(): ResponseInterface {
         ],
         'app' => [
           'canonicalUrl' => (string)$this->request->getUri(),
-          'version'      => $_ENV['VERSION']
+          'version'      => __VERSION__
         ]
       ];
 

diff --git a/src/Application/Action/Vendor/ListVendorPackagesAction.php b/src/Application/Action/Vendor/ListVendorPackagesAction.php
@@ -61,7 +61,7 @@ static function (Package $package): DateTimeImmutable {
           ],
           'app' => [
             'canonicalUrl' => (string)$this->request->getUri(),
-            'version'      => $_ENV['VERSION']
+            'version'      => __VERSION__
           ]
         ]
       );