Merge pull request #14 from bitExpert/feature/phing

Ported bitExpert internal Phing setup over to the disco package.
bitExpert · Dec 4, 2015 · 600897c · 600897c
2 parents 02b9e9a + c6f5135
commit 600897c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,5 +16,6 @@ before_script:
 script:
     - composer validate
     - ./vendor/bin/phing security:check
-    - ./vendor/bin/phpunit
-    - ./vendor/bin/phpcs --standard=PSR2 src
+    - ./vendor/bin/phing sniff
+    - ./vendor/bin/phing unit
+
diff --git a/build.xml b/build.xml
@@ -1,4 +1,37 @@
 <?xml version="1.0"?>
 <project name="disco" basedir="." default="security:check">
     <import file="vendor/bitexpert/phing-securitychecker/build.xml" />
+
+    <target name="sniff">
+        <exec executable="./vendor/bin/phpcs"
+              passthru="true"
+              checkreturn="true">
+            <arg value="--standard=PSR2"/>
+            <arg path="${phing.dir}/src"/>
+            <arg path="${phing.dir}/tests"/>
+        </exec>
+    </target>
+
+    <target name="lint">
+        <exec executable="php"
+              passthru="true"
+              checkreturn="true">
+            <arg value="-l"/>
+            <arg path="${phing.dir}/src"/>
+        </exec>
+
+        <exec executable="php"
+              passthru="true"
+              checkreturn="true">
+            <arg value="-l"/>
+            <arg path="${phing.dir}/tests"/>
+        </exec>
+    </target>
+
+    <target name="unit">
+        <exec executable="./vendor/bin/phpunit"
+              passthru="true"
+              checkreturn="true">
+        </exec>
+    </target>
 </project>
diff --git a/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php b/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php
@@ -224,7 +224,10 @@ public function postProcessorHookRunsAfterLazyBeanCreation()
      */
     public function parameterPassedToBeanFactoryGetsInjectedInBean()
     {
-        $this->beanFactory = new AnnotationBeanFactory(BeanConfigurationWithParameters::class, ['test' => 'injectedValue']);
+        $this->beanFactory = new AnnotationBeanFactory(
+            BeanConfigurationWithParameters::class,
+            ['test' => 'injectedValue']
+        );
         BeanFactoryRegistry::register($this->beanFactory);
 
         $bean = $this->beanFactory->get('sampleServiceWithParam');
@@ -236,13 +239,16 @@ public function parameterPassedToBeanFactoryGetsInjectedInBean()
      */
     public function nestedParameterKeyPassedToBeanFactoryGetsInjectedInBean()
     {
-        $this->beanFactory = new AnnotationBeanFactory(BeanConfigurationWithParameters::class, [
-            'test' => [
-                'nested' => [
-                    'key' => 'injectedValue'
+        $this->beanFactory = new AnnotationBeanFactory(
+            BeanConfigurationWithParameters::class,
+            [
+                'test' => [
+                    'nested' => [
+                        'key' => 'injectedValue'
+                    ]
                 ]
             ]
-        ]);
+        );
 
         BeanFactoryRegistry::register($this->beanFactory);