Skip to content

Commit 36d932c

Browse files
prwaterprwater
committed
Allow multiple references to the same resource on one line in a resource.
1 parent 1628288 commit 36d932c

File tree

8 files changed

+100
-1
lines changed

8 files changed

+100
-1
lines changed

‎lib/ddl/create_tables.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ create table ABC_LINK2
7474
foreign key(rsr_id_rsr) references ABC_RESOURCE(rsr_id)
7575
);
7676

77-
create unique index idx_abc_link2_01 on ABC_LINK2(rsr_id_src, rsr_id_rsr, lk2_line);
77+
create index idx_abc_link2_01 on ABC_LINK2(rsr_id_src, rsr_id_rsr, lk2_line);
7878
create index idx_abc_link2_02 on ABC_LINK2(rsr_id_rsr);

‎test/WebPackerTask/Test10/build.xml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<project name="PhpPlaisio" default="build" basedir=".">
2+
<taskdef name="WebPacker" classname="../../../src.WebPackerTask"/>
3+
<property name="BUILD_DIR" value="./build"/>
4+
5+
<!-- Creates an empty build directory. -->
6+
<target name="prepare">
7+
<echo msg="Preparing files…"/>
8+
<if>
9+
<available property="test_build_directory_exists" file="${BUILD_DIR}" type="dir"/>
10+
<then>
11+
<echo msg="Removing old files…"/>
12+
<delete includeemptydirs="true" verbose="false" failonerror="true">
13+
<fileset dir="${BUILD_DIR}">
14+
<include name="**"/>
15+
</fileset>
16+
</delete>
17+
</then>
18+
<else>
19+
<echo msg="Creating build dir…"/>
20+
<mkdir dir="${BUILD_DIR}"/>
21+
</else>
22+
</if>
23+
</target>
24+
25+
<!-- Copies all required files the the build directory. -->
26+
<target name="copy_files" depends="prepare">
27+
<echo msg="Copying main files…"/>
28+
<copy todir="${BUILD_DIR}" includeemptydirs="true" verbose="false" preservelastmodified="true">
29+
<fileset dir=".">
30+
<include name="**"/>
31+
<exclude name="**.xml"/>
32+
<exclude name="build/**"/>
33+
<exclude name="expected/**"/>
34+
</fileset>
35+
</copy>
36+
</target>
37+
38+
<!-- Optimizes all resources. -->
39+
<target name="web_packer" depends="copy_files">
40+
<fileset dir="${BUILD_DIR}" id="resources">
41+
<include name="www/css/**/*.css"/>
42+
<include name="www/js/**/*.js"/>
43+
<include name="www/images/**/*.*"/>
44+
</fileset>
45+
46+
<!-- Files set with all our own sources -->
47+
<fileset dir="${BUILD_DIR}" id="sources">
48+
<include name="src/**/.php"/>
49+
<include name="www/*.xhtml"/>
50+
</fileset>
51+
52+
<!-- Include the optimized CSS file from the PHP code. -->
53+
<WebPacker sources="sources"
54+
resources="resources"
55+
buildDir="${BUILD_DIR}"
56+
parentResourceDir="www"
57+
preserveLastModified="true"
58+
cssMinifyCommand="/bin/cat"
59+
jsCombineCommand="r.js"
60+
jsMinifyCommand="/bin/cat"
61+
jsNodePath="/usr/bin/node"
62+
jsRequirePath="js/require.js"
63+
webAssetsClasses="Plaisio\WebAssets\WebAssets Plaisio\WebAssets\CoreWebAssets"/>
64+
</target>
65+
66+
<target name="build" depends="web_packer"/>
67+
</project>

‎test/WebPackerTask/Test10/www/images/blue.png

Lines changed: 1 addition & 0 deletions
Loading

‎test/WebPackerTask/Test10/www/images/red.png

Lines changed: 1 addition & 0 deletions
Loading

‎test/WebPackerTask/Test10/www/images/white.png

Lines changed: 1 addition & 0 deletions
Loading

‎test/WebPackerTask/Test10/www/index.xhtml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<!DOCTYPE html PUBLIC '-//W3C//Dtd XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/Dtd/xhtml1-strict.dtd'>
3+
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
4+
<head>
5+
<meta http-equiv='Content-Type' content='text/html;charset=utf-8'/>
6+
<title>Unit Test Optimize CSS</title>
7+
<script type="text/javascript" src="/js/index.js"></script>
8+
</head>
9+
<body>
10+
Unit Test Optimize CSS
11+
</body>
12+
</html>
13+
/* ID: index.xhtml */

‎test/WebPackerTask/Test10/www/js/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* ID: index.js */
2+
3+
let red = '/images/red.png', white1 = '/images/white.png', white2 = '/images/white.png', blue = '/images/blue.png';

‎test/WebPackerTask/WebPackerTaskTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,19 @@ public function testWebPacker09(): void
249249
self::assertTrue(true);
250250
}
251251

252+
//--------------------------------------------------------------------------------------------------------------------
253+
/**
254+
* Test multiple references to the same resource on one line in a resource are allowed.
255+
*/
256+
public function testWebPacker10(): void
257+
{
258+
$this->configureProject(__DIR__.'/Test10/build.xml');
259+
$this->project->setBasedir(__DIR__.'/Test10');
260+
261+
$this->executeTarget('web_packer');
262+
self::assertTrue(true);
263+
}
264+
252265
//--------------------------------------------------------------------------------------------------------------------
253266
/**
254267
* Get all files from directory and subdirectories.

0 commit comments

Comments
 (0)