Move travis config in a subdir of tests; enable debug to help with travis/php5.6

diff --git a/.travis.yml b/.travis.yml
index da4e646..a41255c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,12 @@ before_script:
   - if [ $TRAVIS_PHP_VERSION != "hhvm" -a $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-rm xdebug.ini; fi
 
   # We set up an Apache instance inside the Travis VM and test it.
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then ./.travis/install_apache.sh; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./.travis/install_apache_hhvm.sh; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then ./tests/ci/travis/install_apache.sh; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./tests/ci/travis/install_apache_hhvm.sh; fi"
 
 script:
   # to have code coverage: --coverage-clover=coverage.clover
-  phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php NOPROXY=1
+  phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php NOPROXY=1 DEBUG=1
 
 #after_script:
 #  # upload code-coverage to Scrutinizer

diff --git a/doc/custom.xsl b/doc/custom.xsl
index 7a2e6bb..f648887 100644 (file)
--- a/doc/custom.xsl
+++ b/doc/custom.xsl
@@ -1,87 +1,91 @@
-<?xml version='1.0'?>\r
-<xsl:stylesheet\r
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">\r
-<!--\r
- Customization xsl stylesheet for docbook to chunked html transform\r
- @author Gaetano Giunta\r
- @copyright (c) 2007-2015 G. Giunta\r
- @license code licensed under the BSD License\r
- @todo make the xsl more dynamic: the path to import chunk.xsl could be f.e. rewritten/injected by the php user\r
--->\r
-\r
-\r
-<!-- import base stylesheet -->\r
-<xsl:import href="../../../tools/docbook-xsl/xhtml/chunk.xsl"/>\r
-\r
-\r
-<!-- customization vars -->\r
-<xsl:param name="draft.mode">no</xsl:param>\r
-<xsl:param name="funcsynopsis.style">ansi</xsl:param>\r
-<xsl:param name="html.stylesheet">xmlrpc.css</xsl:param>\r
-<xsl:param name="id.warnings">0</xsl:param>\r
-\r
-\r
-<!-- elements added / modified -->\r
-\r
-<!-- space between function name and opening parenthesis -->\r
-<xsl:template match="funcdef" mode="ansi-nontabular">\r
-  <code>\r
-    <xsl:apply-templates select="." mode="class.attribute"/>\r
-    <xsl:apply-templates mode="ansi-nontabular"/>\r
-    <xsl:text> ( </xsl:text>\r
-  </code>\r
-</xsl:template>\r
-\r
-<!-- space between return type and function name -->\r
-<xsl:template match="funcdef/type" mode="ansi-nontabular">\r
-  <xsl:apply-templates mode="ansi-nontabular"/>\r
-  <xsl:text> </xsl:text>\r
-</xsl:template>\r
-\r
-<!-- space between last param and closing parenthesis, remove tailing semicolon -->\r
-<xsl:template match="void" mode="ansi-nontabular">\r
-  <code>void )</code>\r
-</xsl:template>\r
-\r
-<xsl:template match="varargs" mode="ansi-nontabular">\r
-  <xsl:text>...</xsl:text>\r
-  <code> )</code>\r
-</xsl:template>\r
-\r
-<xsl:template match="paramdef" mode="ansi-nontabular">\r
-  <xsl:apply-templates mode="ansi-nontabular"/>\r
-  <xsl:choose>\r
-    <xsl:when test="following-sibling::*">\r
-      <xsl:text>, </xsl:text>\r
-    </xsl:when>\r
-    <xsl:otherwise>\r
-      <code> )</code>\r
-    </xsl:otherwise>\r
-  </xsl:choose>\r
-</xsl:template>\r
-\r
-<!-- param types get code formatted (leave a space after type, as it is supposed to be before param name) -->\r
-<xsl:template match="paramdef/type" mode="ansi-nontabular">\r
-  <xsl:choose>\r
-    <xsl:when test="$funcsynopsis.decoration != 0">\r
-      <code>\r
-        <xsl:apply-templates mode="ansi-nontabular"/>\r
-      </code>\r
-    </xsl:when>\r
-    <xsl:otherwise>\r
-      <code>\r
-        <xsl:apply-templates mode="ansi-nontabular"/>\r
-      </code>\r
-    </xsl:otherwise>\r
-  </xsl:choose>\r
-  <xsl:text> </xsl:text>\r
-</xsl:template>\r
-\r
-<!-- default values for function parameters -->\r
-<xsl:template match="paramdef/initializer" mode="ansi-nontabular">\r
-  <xsl:text> = </xsl:text>\r
-  <xsl:apply-templates mode="ansi-nontabular"/>\r
-</xsl:template>\r
-\r
-\r
+<?xml version='1.0'?>
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!--
+ Customization xsl stylesheet for docbook to chunked html transform
+ @author Gaetano Giunta
+ @copyright (c) 2007-2015 G. Giunta
+ @license code licensed under the BSD License
+
+ @todo make the xsl more dynamic: the path to import chunk.xsl could be f.e. rewritten/injected by the php user.
+       This would be needed f.e. if the lib is installed as a dependency and is not the top-level composer project.
+       Note: according to http://stackoverflow.com/questions/9861355/using-dynamic-href-in-xslt-import-include this is
+       not easy to do - it would have to be done f.e. by the invoking php script...
+-->
+
+
+<!-- import base stylesheet -->
+<xsl:import href="../vendor/docbook/docbook-xsl/xhtml/chunk.xsl"/>
+
+
+<!-- customization vars -->
+<xsl:param name="draft.mode">no</xsl:param>
+<xsl:param name="funcsynopsis.style">ansi</xsl:param>
+<xsl:param name="html.stylesheet">xmlrpc.css</xsl:param>
+<xsl:param name="id.warnings">0</xsl:param>
+
+
+<!-- elements added / modified -->
+
+<!-- space between function name and opening parenthesis -->
+<xsl:template match="funcdef" mode="ansi-nontabular">
+  <code>
+    <xsl:apply-templates select="." mode="class.attribute"/>
+    <xsl:apply-templates mode="ansi-nontabular"/>
+    <xsl:text> ( </xsl:text>
+  </code>
+</xsl:template>
+
+<!-- space between return type and function name -->
+<xsl:template match="funcdef/type" mode="ansi-nontabular">
+  <xsl:apply-templates mode="ansi-nontabular"/>
+  <xsl:text> </xsl:text>
+</xsl:template>
+
+<!-- space between last param and closing parenthesis, remove tailing semicolon -->
+<xsl:template match="void" mode="ansi-nontabular">
+  <code>void )</code>
+</xsl:template>
+
+<xsl:template match="varargs" mode="ansi-nontabular">
+  <xsl:text>...</xsl:text>
+  <code> )</code>
+</xsl:template>
+
+<xsl:template match="paramdef" mode="ansi-nontabular">
+  <xsl:apply-templates mode="ansi-nontabular"/>
+  <xsl:choose>
+    <xsl:when test="following-sibling::*">
+      <xsl:text>, </xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <code> )</code>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!-- param types get code formatted (leave a space after type, as it is supposed to be before param name) -->
+<xsl:template match="paramdef/type" mode="ansi-nontabular">
+  <xsl:choose>
+    <xsl:when test="$funcsynopsis.decoration != 0">
+      <code>
+        <xsl:apply-templates mode="ansi-nontabular"/>
+      </code>
+    </xsl:when>
+    <xsl:otherwise>
+      <code>
+        <xsl:apply-templates mode="ansi-nontabular"/>
+      </code>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:text> </xsl:text>
+</xsl:template>
+
+<!-- default values for function parameters -->
+<xsl:template match="paramdef/initializer" mode="ansi-nontabular">
+  <xsl:text> = </xsl:text>
+  <xsl:apply-templates mode="ansi-nontabular"/>
+</xsl:template>
+
+
 </xsl:stylesheet>
\ No newline at end of file

diff --git a/.travis/apache_vhost b/tests/ci/travis/apache_vhost
similarity index 100%
rename from .travis/apache_vhost
rename to tests/ci/travis/apache_vhost

diff --git a/.travis/apache_vhost_hhvm b/tests/ci/travis/apache_vhost_hhvm
similarity index 100%
rename from .travis/apache_vhost_hhvm
rename to tests/ci/travis/apache_vhost_hhvm

diff --git a/.travis/install_apache.sh b/tests/ci/travis/install_apache.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 90%
rename from .travis/install_apache.sh
rename to tests/ci/travis/install_apache.sh
index e7a5fe5..c5b0875
--- a/.travis/install_apache.sh
+++ b/tests/ci/travis/install_apache.sh
@@ -12,6 +12,6 @@ echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php
 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
 
 # configure apache virtual hosts
-sudo cp -f .travis/apache_vhost /etc/apache2/sites-available/default
+sudo cp -f tests/ci/apache_vhost /etc/apache2/sites-available/default
 sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
 sudo service apache2 restart

diff --git a/.travis/install_apache_hhvm.sh b/tests/ci/travis/install_apache_hhvm.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 80%
rename from .travis/install_apache_hhvm.sh
rename to tests/ci/travis/install_apache_hhvm.sh
index 9e2869d..1ff3ddd
--- a/.travis/install_apache_hhvm.sh
+++ b/tests/ci/travis/install_apache_hhvm.sh
@@ -10,6 +10,6 @@ sudo a2enmod rewrite actions fastcgi alias
 hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true
 
 # configure apache virtual hosts
-sudo cp -f .travis/apache_vhost_hhvm /etc/apache2/sites-available/default
+sudo cp -f tests/ci/travis/apache_vhost_hhvm /etc/apache2/sites-available/default
 sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
 sudo service apache2 restart
\ No newline at end of file