Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fileset excludefile #1892

Merged
merged 54 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
fe38a90
Merge remote-tracking branch 'upstream/master'
jawira Feb 11, 2019
974a2f1
Merge remote-tracking branch 'upstream/master'
jawira Jul 1, 2019
c3b1e48
Merge remote-tracking branch 'upstream/master'
jawira Jul 12, 2019
32e4914
Merge remote-tracking branch 'upstream/master'
jawira Jul 26, 2019
275cc96
Merge remote-tracking branch 'upstream/master'
jawira Oct 23, 2019
4de09d3
ComposerTask: update code & doc #1163
jawira Oct 23, 2019
64aefbf
Merge branch 'master' of github.com:jawira/fork-phing
jawira Nov 19, 2019
d769c90
Merge remote-tracking branch 'upstream/master'
jawira Nov 19, 2019
9d8da67
Merge remote-tracking branch 'upstream/master'
jawira Aug 8, 2020
2549e00
Merge remote-tracking branch 'upstream/master'
jawira Sep 5, 2020
b57b6da
Merge remote-tracking branch 'upstream/master'
jawira Sep 29, 2020
ec4ab93
Merge remote-tracking branch 'upstream/master'
jawira Oct 17, 2020
8f5343c
Merge remote-tracking branch 'upstream/master'
jawira Oct 29, 2020
d098a0f
Merge remote-tracking branch 'upstream/master'
jawira Dec 14, 2020
c7bcabf
Merge remote-tracking branch 'upstream/master'
jawira Dec 19, 2020
919e771
Merge remote-tracking branch 'upstream/main' into main
jawira Feb 2, 2021
424a754
Merge remote-tracking branch 'upstream/main'
jawira Mar 9, 2021
f79dc57
Merge remote-tracking branch 'upstream/main'
jawira Mar 16, 2021
12c46e9
Merge remote-tracking branch 'upstream/main' into main
jawira Apr 19, 2021
605d358
Merge remote-tracking branch 'upstream/main' into main
jawira Apr 26, 2021
342c9ac
Merge remote-tracking branch 'upstream/main' into main
jawira May 4, 2021
8451ae1
Merge remote-tracking branch 'upstream/main' into main
jawira May 16, 2021
bd5938e
Merge remote-tracking branch 'upstream/main' into main
jawira Jun 12, 2021
180cea1
Merge branch 'phingofficial:main' into main
jawira Jul 15, 2021
3fc32f0
Merge branch 'main' of github.com:jawira/fork-phing into main
jawira Jul 15, 2021
7f4b766
Merge branch 'phingofficial:main' into main
jawira Sep 1, 2021
be081b8
Merge branch 'phingofficial:main' into main
jawira Sep 2, 2021
642f834
Merge branch 'phingofficial:main' into main
jawira Sep 5, 2021
32abe87
Merge branch 'phingofficial:main' into main
jawira Sep 11, 2021
4874f43
Merge branch 'phingofficial:main' into main
jawira Sep 19, 2021
552975b
Merge branch 'phingofficial:main' into main
jawira Sep 21, 2021
d0f2c6f
Merge branch 'phingofficial:main' into main
jawira Oct 7, 2021
e620b41
Merge branch 'phingofficial:main' into main
jawira Nov 23, 2021
d20c869
Merge branch 'phingofficial:main' into main
jawira Dec 2, 2021
cb21aae
Merge branch 'phingofficial:main' into main
jawira Mar 6, 2022
1ffdba8
Merge branch 'phingofficial:main' into main
jawira May 18, 2022
194d65b
Merge branch 'phingofficial:main' into main
jawira May 27, 2022
b51de43
Merge branch 'phingofficial:main' into main
jawira Jul 9, 2022
f22c0a6
Merge branch 'phingofficial:main' into main
jawira Aug 8, 2022
466f6f2
Merge branch 'phingofficial:main' into main
jawira Oct 13, 2022
d24a326
Merge branch 'phingofficial:main' into main
jawira Jan 15, 2023
074d1c1
Merge branch 'phingofficial:main' into main
jawira Jan 19, 2023
1a67260
Merge branch 'phingofficial:main' into main
jawira Jan 23, 2023
1a53cdb
Merge branch 'phingofficial:main' into main
jawira Apr 21, 2023
33136cd
Merge branch 'phingofficial:main' into main
jawira Jul 5, 2023
aea91d4
Merge branch 'phingofficial:main' into main
jawira Jul 14, 2023
70df7d1
Merge branch 'phingofficial:main' into main
jawira Dec 17, 2023
2208162
Merge branch 'phingofficial:main' into main
jawira Mar 19, 2024
2b04aec
Merge branch 'phingofficial:main' into main
jawira May 29, 2024
e549fe1
Merge branch 'phingofficial:main' into main
jawira Jul 1, 2024
e57bd38
Merge branch 'phingofficial:main' into main
jawira Dec 8, 2024
7aa6d4a
Merge branch 'phingofficial:main' into main
jawira Dec 31, 2024
e1455ec
fix: Add type to $excl parameter to fix type error
jawira Jan 5, 2025
9dcac69
Merge branch 'main' into fix-excludes
siad007 Jan 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Phing/Type/AbstractFileSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ public function setIncludesfile(File $incl)
*
* @throws BuildException
*/
public function setExcludesfile($excl)
public function setExcludesfile(File $excl)
{
if ($this->isReference()) {
throw $this->tooManyAttributes();
Expand Down
19 changes: 17 additions & 2 deletions tests/Phing/Test/Task/System/CopyTaskTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function setUp(): void
{
$this->configureProject(
PHING_TEST_BASE
. '/etc/tasks/system/CopyTaskTest.xml'
. '/etc/tasks/system/CopyTask/CopyTaskTest.xml'
);
$this->executeTarget('setup');
}
Expand Down Expand Up @@ -90,11 +90,26 @@ public function testOverwriteExistingSymlink(): void
{
$this->executeTarget(__FUNCTION__);
$this->assertInLogs('Copying 1 file to');
$this->assertEquals('tmp/target-a', readlink(PHING_TEST_BASE . '/etc/tasks/system/tmp/link-b'));
$this->assertEquals('tmp/target-a', readlink(PHING_TEST_BASE . '/etc/tasks/system/CopyTask/tmp/link-b'));
}

public function testGranularity(): void
{
$this->expectLogContaining(__FUNCTION__, 'Test omitted, Test is up to date');
}

public function testFilesetFiles(): void
{
$destinationDir = PHING_TEST_BASE . '/etc/tasks/system/CopyTask/tmp/destination';
$this->assertDirectoryDoesNotExist($destinationDir);
$this->executeTarget(__FUNCTION__);
$this->assertFileExists("$destinationDir/Foo/Foo.php");
$this->assertFileExists("$destinationDir/Bar/Bar.php");
$this->assertFileExists("$destinationDir/Baz/Baz.php");
$this->assertFileExists("$destinationDir/Qux/Qux.php");
$this->assertFileDoesNotExist("$destinationDir/Foo/FooTest.php");
$this->assertFileDoesNotExist("$destinationDir/Bar/BarTest.php");
$this->assertFileDoesNotExist("$destinationDir/Baz/BazTest.php");
$this->assertFileDoesNotExist("$destinationDir/Qux/QuxTest.php");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,22 @@
<copy file="${tmp.dir}/copysrcs/Test" todir="${tmp.dir}/copydest" granularity="999999999" overwrite="false"/>
</target>

<target name="testFilesetFiles" description="test fileset include and excludes files">
<touch mkdirs="true" file="${tmp.dir}/source/Foo/Foo.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Foo/FooTest.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Bar/Bar.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Bar/BarTest.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Baz/Baz.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Baz/BazTest.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Qux/Qux.php"/>
<touch mkdirs="true" file="${tmp.dir}/source/Qux/QuxTest.php"/>
<mkdir dir="${tmp.dir}/destination"/>
<copy haltonerror="true" todir="${tmp.dir}/destination">
<fileset dir="${tmp.dir}/source"
includesfile="includes.txt"
excludesfile="excludes.txt"/>
</copy>
</target>

<target name="main"/>
</project>
1 change: 1 addition & 0 deletions tests/etc/tasks/system/CopyTask/excludes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*Test.php
1 change: 1 addition & 0 deletions tests/etc/tasks/system/CopyTask/includes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.php
Loading