From 8e6c28e6e5c9ef473c705f49a4b9f30ed774231b Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 30 Sep 2015 11:13:06 +0200
Subject: [PATCH] more standardization

---
 .editorconfig                                 |  7 ++++++
 .gitattributes                                |  1 +
 .gitignore                                    |  6 +++--
 BUGS                                          |  1 +
 CREDITS                                       |  3 ++-
 README.md                                     |  7 ++++--
 TODO                                          |  0
 config.m4                                     |  8 +-----
 config.w32                                    | 25 ++++++++++++-------
 config0.m4                                    | 24 ++++++++++++++++++
 package.xml                                   | 13 +++++++---
 .../gen_travis_yml.php                        |  0
 php_propro.c => src/php_propro_api.c          |  0
 php_propro_api.h => src/php_propro_api.h      |  0
 14 files changed, 71 insertions(+), 24 deletions(-)
 create mode 100644 BUGS
 create mode 100644 TODO
 create mode 100644 config0.m4
 rename gen_travis_yml.php => scripts/gen_travis_yml.php (100%)
 rename php_propro.c => src/php_propro_api.c (100%)
 rename php_propro_api.h => src/php_propro_api.h (100%)

diff --git a/.editorconfig b/.editorconfig
index 84c9933..9b444ae 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,3 +14,10 @@ trim_trailing_whitespace = false
 [*.json]
 indent_style = space
 indent_size = 4
+
+[package.xml]
+indent_style = space
+indent_size = 1
+
+[config.w32]
+end_of_line = crlf
diff --git a/.gitattributes b/.gitattributes
index f6d1a5e..9d51e13 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 package.xml		merge=touch
 php_propro.h	merge=touch
+config.w32		eol=crlf
diff --git a/.gitignore b/.gitignore
index a59cb22..82c850f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 *~
 /*.tgz
 /.deps
-/*.lo
-/*.la
+*.lo
+*.la
 /config.[^wm]*
 /configure*
 /lib*
@@ -21,3 +21,5 @@
 /autom4te*
 /.dep.inc
 run-tests.php
+.libs/
+/php_propro_api.h
diff --git a/BUGS b/BUGS
new file mode 100644
index 0000000..75711d2
--- /dev/null
+++ b/BUGS
@@ -0,0 +1 @@
+Yay, now known and unresolved issues yet!
diff --git a/CREDITS b/CREDITS
index 28b53ed..920bbcb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1 +1,2 @@
-propro
\ No newline at end of file
+propro
+Michael Wallner
diff --git a/README.md b/README.md
index 88242d9..a4aaa1f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,16 @@
 # ext-propro
 
-[![Build Status](https://travis-ci.org/m6w6/ext-propro.svg?branch=R_1_0)](https://travis-ci.org/m6w6/ext-propro)
+[![Build Status](https://travis-ci.org/m6w6/ext-propro.svg?branch=v1.0.x)](https://travis-ci.org/m6w6/ext-propro)
 
-Property Proxy
+The "Property Proxy" extension provides a fairly transparent proxy for internal
+object properties hidden in custom non-zval implementations.
 
 ## Documentation
 
 See the [online markdown reference](https://mdref.m6w6.name/propro).
 
+Known issues are listed in [BUGS](./BUGS) and future ideas can be found in [TODO](./TODO).
+
 ## Installing
 
 ### PECL
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..e69de29
diff --git a/config.m4 b/config.m4
index 1a4965e..3b883c8 100644
--- a/config.m4
+++ b/config.m4
@@ -1,7 +1 @@
-PHP_ARG_ENABLE(propro, whether to enable property proxy support,
-[  --enable-propro           Enable property proxy support])
-
-if test "$PHP_PROPRO" != "no"; then
-	PHP_INSTALL_HEADERS(ext/propro, php_propro.h php_propro_api.h)
-	PHP_NEW_EXTENSION(propro, php_propro.c, $ext_shared)
-fi
+sinclude(config0.m4)
diff --git a/config.w32 b/config.w32
index 53ab56e..ed086e8 100644
--- a/config.w32
+++ b/config.w32
@@ -1,9 +1,16 @@
-
-ARG_ENABLE("propro", "for propro support", "no");
-
-if (PHP_PROPRO == "yes") {
-		EXTENSION("propro", "php_propro.c");
-
-		AC_DEFINE("HAVE_PROPRO", 1);
-		PHP_INSTALL_HEADERS("ext/propro", "php_propro.h");
-}
+
+ARG_ENABLE("propro", "for propro support", "no");
+
+if (PHP_PROPRO == "yes") {
+	var PHP_PROPRO_HEADERS=glob("src/*.h"), PHP_PROPRO_SOURCES=glob("src/*.c");
+
+	EXTENSION("propro", PHP_PROPRO_SOURCES);
+	PHP_INSTALL_HEADERS("ext/propro", "php_propro.h");
+	for (var i=0; i<PHP_PROPRO_HEADERS.length; ++i) {
+		var basename = FSO.GetFileName(PHP_PROPRO_HEADERS[i]);
+		copy_and_subst(PHP_PROPRO_HEADERS[i], basename, []);
+		PHP_INSTALL_HEADERS("ext/propro", basename);
+	}
+
+	AC_DEFINE("HAVE_PROPRO", 1);
+}
diff --git a/config0.m4 b/config0.m4
new file mode 100644
index 0000000..d744578
--- /dev/null
+++ b/config0.m4
@@ -0,0 +1,24 @@
+PHP_ARG_ENABLE(propro, whether to enable property proxy support,
+[  --enable-propro         Enable property proxy support])
+
+if test "$PHP_PROPRO" != "no"; then
+	PHP_PROPRO_SRCDIR=PHP_EXT_SRCDIR(propro)
+	PHP_PROPRO_BUILDDIR=PHP_EXT_BUILDDIR(propro)
+
+	PHP_ADD_INCLUDE($PHP_PROPRO_SRCDIR/src)
+	PHP_ADD_BUILD_DIR($PHP_PROPRO_BUILDDIR/src)
+
+	PHP_PROPRO_HEADERS=`(cd $PHP_PROPRO_SRCDIR/src && echo *.h)`
+	PHP_PROPRO_SOURCES=`(cd $PHP_PROPRO_SRCDIR && echo src/*.c)`
+
+	PHP_NEW_EXTENSION(propro, $PHP_PROPRO_SOURCES, $ext_shared)
+	PHP_INSTALL_HEADERS(ext/propro, php_propro.h $PHP_PROPRO_HEADERS)
+
+	PHP_SUBST(PHP_PROPRO_HEADERS)
+	PHP_SUBST(PHP_PROPRO_SOURCES)
+
+	PHP_SUBST(PHP_PROPRO_SRCDIR)
+	PHP_SUBST(PHP_PROPRO_BUILDDIR)
+
+	PHP_ADD_MAKEFILE_FRAGMENT
+fi
diff --git a/package.xml b/package.xml
index 60f0d38..f926f4d 100644
--- a/package.xml
+++ b/package.xml
@@ -35,18 +35,25 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <contents>
   <dir name="/">
    <file role="doc" name="AUTHORS"/>
+   <file role="doc" name="BUGS"/>
    <file role="doc" name="CONTRIBUTING.md"/>
    <file role="doc" name="CREDITS"/>
    <file role="doc" name="LICENSE"/>
    <file role="doc" name="README.md"/>
    <file role="doc" name="THANKS"/>
+   <file role="doc" name="TODO"/>
    <file role="src" name="config.m4"/>
+   <file role="src" name="config0.m4"/>
    <file role="src" name="config.w32" />
    <file role="doc" name="Doxyfile" />
    <file role="src" name="php_propro.h" />
-   <file role="src" name="php_propro_api.h" />
-   <file role="src" name="php_propro.c" />
-
+   <dir name="src">
+    <file role="src" name="php_propro_api.h"/>
+    <file role="src" name="php_propro_api.c"/>
+   </dir>
+   <dir name="scripts">
+    <file role="src" name="gen_travis_yml.php"/>
+   </dir>
    <dir name="tests">
     <file role="test" name="001.phpt" />
     <file role="test" name="002.phpt" />
diff --git a/gen_travis_yml.php b/scripts/gen_travis_yml.php
similarity index 100%
rename from gen_travis_yml.php
rename to scripts/gen_travis_yml.php
diff --git a/php_propro.c b/src/php_propro_api.c
similarity index 100%
rename from php_propro.c
rename to src/php_propro_api.c
diff --git a/php_propro_api.h b/src/php_propro_api.h
similarity index 100%
rename from php_propro_api.h
rename to src/php_propro_api.h
-- 
2.30.2