Skip to content

Commit 4b23ad4

Browse files
committed
Merge branch '1.0-dev' of https://github.com/technicalguru/php-email into 1.0-dev
2 parents 498cfa8 + fb0d235 commit 4b23ad4

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ composer.phar
66
# composer.lock
77
/composer.lock
88
/set-local-test-env.sh
9+
/nbproject/private/

nbproject/project.properties

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
include.path=${php.global.include.path}
2+
php.version=PHP_73
3+
source.encoding=UTF-8
4+
src.dir=.
5+
tags.asp=false
6+
tags.short=false
7+
web.root=.

nbproject/project.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://www.netbeans.org/ns/project/1">
3+
<type>org.netbeans.modules.php.project</type>
4+
<configuration>
5+
<data xmlns="http://www.netbeans.org/ns/php-project/1">
6+
<name>php-email</name>
7+
</data>
8+
</configuration>
9+
</project>

test.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Test script
2+
23
composer update
3-
RC=./vendor/phpunit/phpunit/phpunit tests
4-
rm -rf vendor composer.lock
4+
./vendor/phpunit/phpunit/phpunit tests
5+
RC=$?
56
exit $RC
67

0 commit comments

Comments
 (0)