Merge branch '7.5' into 8.3

sebastianbergmann · Aug 3, 2019 · 668d8cc · 668d8cc
2 parents ffd0108 + 062dfa4
commit 668d8cc
Showing 1 changed file with 40 additions and 40 deletions.
diff --git a/build.xml b/build.xml
@@ -155,6 +155,12 @@
             </fileset>
         </copy>
 
+        <copy todir="${basedir}/build/phar/php-invoker">
+            <fileset dir="${basedir}/vendor/phpunit/php-invoker/src">
+                <include name="**/*.php" />
+            </fileset>
+        </copy>
+
         <copy file="${basedir}/vendor/phpunit/php-text-template/LICENSE" tofile="${basedir}/build/phar/php-text-template/LICENSE"/>
         <copy todir="${basedir}/build/phar/php-text-template">
             <fileset dir="${basedir}/vendor/phpunit/php-text-template/src">
@@ -211,20 +217,6 @@
             </fileset>
         </copy>
 
-        <copy file="${basedir}/vendor/sebastian/recursion-context/LICENSE" tofile="${basedir}/build/phar/sebastian-recursion-context/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-recursion-context">
-            <fileset dir="${basedir}/vendor/sebastian/recursion-context/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/resource-operations/LICENSE" tofile="${basedir}/build/phar/sebastian-resource-operations/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-resource-operations">
-            <fileset dir="${basedir}/vendor/sebastian/resource-operations/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
         <copy file="${basedir}/vendor/sebastian/global-state/LICENSE" tofile="${basedir}/build/phar/sebastian-global-state/LICENSE"/>
         <copy todir="${basedir}/build/phar/sebastian-global-state">
             <fileset dir="${basedir}/vendor/sebastian/global-state/src">
@@ -246,6 +238,20 @@
             </fileset>
         </copy>
 
+        <copy file="${basedir}/vendor/sebastian/recursion-context/LICENSE" tofile="${basedir}/build/phar/sebastian-recursion-context/LICENSE"/>
+        <copy todir="${basedir}/build/phar/sebastian-recursion-context">
+            <fileset dir="${basedir}/vendor/sebastian/recursion-context/src">
+                <include name="**/*.php" />
+            </fileset>
+        </copy>
+
+        <copy file="${basedir}/vendor/sebastian/resource-operations/LICENSE" tofile="${basedir}/build/phar/sebastian-resource-operations/LICENSE"/>
+        <copy todir="${basedir}/build/phar/sebastian-resource-operations">
+            <fileset dir="${basedir}/vendor/sebastian/resource-operations/src">
+                <include name="**/*.php" />
+            </fileset>
+        </copy>
+
         <copy file="${basedir}/vendor/sebastian/type/LICENSE" tofile="${basedir}/build/phar/sebastian-type/LICENSE"/>
         <copy todir="${basedir}/build/phar/sebastian-type">
             <fileset dir="${basedir}/vendor/sebastian/type/src">
@@ -267,8 +273,23 @@
             </fileset>
         </copy>
 
-        <copy todir="${basedir}/build/phar/php-invoker">
-            <fileset dir="${basedir}/vendor/phpunit/php-invoker/src">
+        <copy file="${basedir}/vendor/myclabs/deep-copy/LICENSE" tofile="${basedir}/build/phar/myclabs-deep-copy/LICENSE"/>
+        <copy todir="${basedir}/build/phar/myclabs-deep-copy">
+            <fileset dir="${basedir}/vendor/myclabs/deep-copy/src">
+                <include name="**/*.php" />
+            </fileset>
+        </copy>
+
+        <copy file="${basedir}/vendor/phar-io/manifest/LICENSE" tofile="${basedir}/build/phar/phar-io-manifest/LICENSE"/>
+        <copy todir="${basedir}/build/phar/phar-io-manifest">
+            <fileset dir="${basedir}/vendor/phar-io/manifest/src">
+                <include name="**/*.php" />
+            </fileset>
+        </copy>
+
+        <copy file="${basedir}/vendor/phar-io/version/LICENSE" tofile="${basedir}/build/phar/phar-io-version/LICENSE"/>
+        <copy todir="${basedir}/build/phar/phar-io-version">
+            <fileset dir="${basedir}/vendor/phar-io/version/src">
                 <include name="**/*.php" />
             </fileset>
         </copy>
@@ -301,9 +322,9 @@
             </fileset>
         </copy>
 
-        <copy file="${basedir}/vendor/myclabs/deep-copy/LICENSE" tofile="${basedir}/build/phar/myclabs-deep-copy/LICENSE"/>
-        <copy todir="${basedir}/build/phar/myclabs-deep-copy">
-            <fileset dir="${basedir}/vendor/myclabs/deep-copy/src">
+        <copy file="${basedir}/vendor/theseer/tokenizer/LICENSE" tofile="${basedir}/build/phar/theseer-tokenizer/LICENSE"/>
+        <copy todir="${basedir}/build/phar/theseer-tokenizer">
+            <fileset dir="${basedir}/vendor/theseer/tokenizer/src">
                 <include name="**/*.php" />
             </fileset>
         </copy>
@@ -314,27 +335,6 @@
                 <include name="**/*.php" />
             </fileset>
         </copy>
-
-        <copy file="${basedir}/vendor/phar-io/manifest/LICENSE" tofile="${basedir}/build/phar/phar-io-manifest/LICENSE"/>
-        <copy todir="${basedir}/build/phar/phar-io-manifest">
-            <fileset dir="${basedir}/vendor/phar-io/manifest/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phar-io/version/LICENSE" tofile="${basedir}/build/phar/phar-io-version/LICENSE"/>
-        <copy todir="${basedir}/build/phar/phar-io-version">
-            <fileset dir="${basedir}/vendor/phar-io/version/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/theseer/tokenizer/LICENSE" tofile="${basedir}/build/phar/theseer-tokenizer/LICENSE"/>
-        <copy todir="${basedir}/build/phar/theseer-tokenizer">
-            <fileset dir="${basedir}/vendor/theseer/tokenizer/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="-phar-build" depends="-phar-determine-version">