Update deps, pipeline config, bump version

Author: Ralph Wissing

.gitlab-ci.yml

@@ -1,56 +1,12 @@
 image: lovullo/php-ci
 
-stages:
-    - dependencies
-    - validate
-    - test
-    - analysis
-    - compile
-    - deploy
-
-composer:
-    stage: dependencies
-    script:
-        # Install dependencies via Composer
-        - composer install -o
-    artifacts:
-        paths:
-            - vendor/
-        expire_in: 10 min
-
-check-mergeconflicts:
-    stage: validate
-    script:
-        - ant check_mergeconflicts
-    before_script: []
-
-phplint:
-    stage: validate
-    script:
-        - ant phplint
-    before_script: []
-
-phpunit:
-    stage: test
-    script:
-        - ant phpunit
-    before_script: []
-
-phpcs:
-    stage: analysis
-    script:
-        - ant phpcs
-    before_script: []
-
-phpmd:
-    stage: analysis
-    script:
-        - ant phpmd
-    before_script: []
-
-phpcpd:
-    stage: analysis
-    script:
-        - ant phpcpd
-    before_script: []
+include:
+    - 'http://devops.pages.lovullo.com/shared-pipelines/jobs-common.yml'
+    - 'http://devops.pages.lovullo.com/shared-pipelines/jobs-composer-install.yml'
+    - 'http://devops.pages.lovullo.com/shared-pipelines/jobs-php-static-analysis.yml'
+
+variables:
+    phpunit_config: "test/"
+    phpcs_ignore:   "vendor/,test/"
+    phpmd_ignore:   "vendor/,test/"
 

build.xml

@@ -1,18 +1,11 @@
 <?xml version="1.0"?>
 <project name="libliza-php" default="build">
-  <property name="phpunitconfig" value="${basedir}/test/"/>
-  <property name="phpcsignore" value="vendor/,test/" />
-  <property name="phpmdignore" value="vendor/,test/" />
-
-  <import file="${basedir}/vendor/lovullo/phpqaconfig/build.xml"/>
-
 
   <target name="build"
           description="Compile all dependent code">
     <!-- nothing yet -->
   </target>
 
-
   <target name="setup"
           description="Perform initial repository setup tasks">
     <exec dir="${basedir}"
@@ -24,19 +17,16 @@
     <antcall target="build" />
   </target>
 
-
   <!-- standard target in Makefiles -->
   <target name="check"
           description="Run tests"
-          depends="phpunit, diagram-chk" />
-
+          depends="diagram-chk" />
 
   <!-- alias for check -->
   <target name="test"
           description="Run tests"
           depends="check" />
 
-
   <target name="diagram-chk"
           description="QA check on diagrams">
     <exec executable="build-aux/diagram-chk" />
@@ -48,5 +38,5 @@
         <arg line="-s 1500 -e build/class-uml.png doc/diagrams/class-uml.dia" />
     </exec>
   </target>
-</project>
 
+</project>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "lovullo/libliza-php",
     "description": "PHP client for the Liza Data Collection Framework",
-    "version": "0.7.0",
+    "version": "0.7.1",
     "type": "project",
     "keywords": [ "liza" ],
     "license": "GPL-3.0+",
@@ -12,7 +12,9 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
-        "lovullo/phpqaconfig": "@stable"
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": ">=4.7"
     }
 }