From: Michael Wallner <mike@php.net>
Date: Fri, 15 May 2015 08:18:01 +0000 (+0200)
Subject: use a Metadata class
X-Git-Tag: v4.0.0~7
X-Git-Url: https://git.m6w6.name/?p=pharext%2Fpharext;a=commitdiff_plain;h=c61404bba9e446429740a134deb5cf8f29f1e0f3

use a Metadata class
---

diff --git a/Makefile b/Makefile
index 4c78e66..41b8041 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,11 @@ release:
 	@echo "Previous Version: $$(git tag --list | tail -n1)"; \
 	read -p "Release Version:  v" VERSION; \
 	echo "Preparing release ... "; \
-	sed -e "s/@PHAREXT_VERSION@/$$VERSION/" build/Version.php.in > src/pharext/Version.php && \
+	sed -e "s/@dev-master/$$VERSION/" build/Metadata.php.in > src/pharext/Metadata.php && \
 	$(MAKE) -B SIGN=1 && \
 	git ci -am "release v$$VERSION" && \
 	git tag v$$VERSION && \
-	cp build/Version.php.in src/pharext/Version.php && \
+	cp build/Metadata.php.in src/pharext/Metadata.php && \
 	git ci -am "back to dev"
 
 .PHONY: all clean test release
diff --git a/bin/pharext b/bin/pharext
index 1d9f2b0..bd2b67f 100755
Binary files a/bin/pharext and b/bin/pharext differ
diff --git a/build/Metadata.php.in b/build/Metadata.php.in
new file mode 100644
index 0000000..db3ab81
--- /dev/null
+++ b/build/Metadata.php.in
@@ -0,0 +1,26 @@
+<?php
+
+namespace pharext;
+
+class Metadata
+{
+	static function version() {
+		return "@dev-master";
+	}
+
+	static function header() {
+		return sprintf("pharext v%s (c) Michael Wallner <mike@php.net>", self::version());
+	}
+
+	static function date() {
+		return gmdate("Y-m-d");
+	}
+
+	static function all() {
+		return [
+			"version" => self::version(),
+			"header" => self::header(),
+			"date" => self::date(),
+		];
+	}
+}
diff --git a/build/Version.php.in b/build/Version.php.in
deleted file mode 100644
index 50a2875..0000000
--- a/build/Version.php.in
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace pharext;
-
-const VERSION = "@PHAREXT_VERSION@";
diff --git a/build/create-phar.php b/build/create-phar.php
index 4836ceb..409bf8e 100644
--- a/build/create-phar.php
+++ b/build/create-phar.php
@@ -11,11 +11,8 @@ spl_autoload_register(function($c) {
 
 require_once __DIR__."/../src/pharext/Version.php";
 
-$file = (new pharext\Task\PharBuild(null, [
-	"header" => sprintf("pharext v%s (c) Michael Wallner <mike@php.net>", pharext\VERSION),
-	"version" => pharext\VERSION,
+$file = (new pharext\Task\PharBuild(null, pharext\Metadata::all() + [
 	"name" => "pharext",
-	"date" => date("Y-m-d"),
 	"stub" => "pharext_packager.php",
 	"license" => file_get_contents(__DIR__."/../LICENSE")
 ], false))->run();
diff --git a/src/pharext/Metadata.php b/src/pharext/Metadata.php
new file mode 100644
index 0000000..db3ab81
--- /dev/null
+++ b/src/pharext/Metadata.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace pharext;
+
+class Metadata
+{
+	static function version() {
+		return "@dev-master";
+	}
+
+	static function header() {
+		return sprintf("pharext v%s (c) Michael Wallner <mike@php.net>", self::version());
+	}
+
+	static function date() {
+		return gmdate("Y-m-d");
+	}
+
+	static function all() {
+		return [
+			"version" => self::version(),
+			"header" => self::header(),
+			"date" => self::date(),
+		];
+	}
+}
diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index c08fce0..cd3b4d6 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -243,11 +243,16 @@ class Packager implements Command
 	 */
 	private function createPackage() {
 		try {
-			$meta = array_merge($this->metadata(), [
-				"date" => date("Y-m-d"),
+			if (($glob = glob($this->source->getBaseDir()."/LICENSE*"))) {
+				$license = file_get_contents(current($glob));
+			} else {
+				$this->warn("Could not find any LICENSE.* files!\n");
+				$license = "UNKNOWN\n";
+			}
+			$meta = array_merge(Metadata::all(), [
 				"name" => $this->args->name,
 				"release" => $this->args->release,
-				"license" => @file_get_contents(current(glob($this->source->getBaseDir()."/LICENSE*"))),
+				"license" => $license,
 				"stub" => "pharext_installer.php",
 				"type" => $this->args->zend ? "zend_extension" : "extension",
 			]);
diff --git a/src/pharext/Version.php b/src/pharext/Version.php
deleted file mode 100644
index 50a2875..0000000
--- a/src/pharext/Version.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace pharext;
-
-const VERSION = "@PHAREXT_VERSION@";