Browse Source

Move development from fork to main repo on develop branch, test more PHP versions

Timothy J. Warren 2 years ago
parent
commit
6e1f28724e
5 changed files with 41 additions and 8 deletions
  1. 5
    0
      .gitlab-ci.yml
  2. 2
    2
      .travis.yml
  3. 4
    4
      CONTRIBUTING.md
  4. 27
    0
      LICENSE.md
  5. 3
    2
      sonar-project.properties

+ 5
- 0
.gitlab-ci.yml View File

@@ -15,6 +15,11 @@ variables:
15 15
     POSTGRES_USER: test
16 16
     POSTGRES_PASSWORD: test
17 17
 
18
+test:5.5:
19
+    image: php:5.5
20
+    script:
21
+      - phpunit -c build --no-coverage
22
+
18 23
 test:5.6:
19 24
     image: php:5.6
20 25
     script:

+ 2
- 2
.travis.yml View File

@@ -3,10 +3,10 @@ sudo: false
3 3
 language: php
4 4
 
5 5
 php:
6
-  - 5.3
7 6
   - 5.4
8 7
   - 5.5
9 8
   - 5.6
9
+  - 7
10 10
   - hhvm
11 11
   - nightly
12 12
 
@@ -27,5 +27,5 @@ after_script:
27 27
 
28 28
 matrix:
29 29
   allow_failures:
30
-    - php: 5.3
30
+    - php: 5.4
31 31
     - php: hhvm

+ 4
- 4
CONTRIBUTING.md View File

@@ -1,10 +1,10 @@
1
-#Contributing
1
+# Contributing
2 2
 
3
-Please submit pull requests to [timw4mail/Query](https://github.com/timw4mail/Query), but other issues to [aviat4ion/Query](https://github.com/aviat4ion/Query)
3
+Please submit pull requests and issues to [aviat4ion/Query](https://git.timshomepage.net/aviat4ion/Query)
4 4
 
5
-###Pull Requests
5
+### Pull Requests
6 6
 * All pull requests should have accompanying tests following the structure / makeup of the `/tests` folder
7
-* Pull requests should reference the issue number on [aviat4ion/Query](https://github.com/aviat4ion/Query), if applicable.
7
+* Pull requests should reference the issue number on [aviat4ion/Query](https://git.timshomepage.net/aviat4ion/Query), if applicable.
8 8
 * Pull requests must follow project style:
9 9
 	1. Follow [CodeIgniter Style](http://codeigniter.com/user_guide/general/styleguide.html)
10 10
 	2. Use tabs for indentation, and do not align arrays or other multiple line statements.

+ 27
- 0
LICENSE.md View File

@@ -0,0 +1,27 @@
1
+# DON'T BE A DICK PUBLIC LICENSE
2
+
3
+> Version 1, December 2009
4
+
5
+> Copyright (C) 2012 Timothy J. Warren <tim@timshomepage.net>
6
+
7
+ Everyone is permitted to copy and distribute verbatim or modified
8
+ copies of this license document, and changing it is allowed as long
9
+ as the name is changed.
10
+
11
+> DON'T BE A DICK PUBLIC LICENSE
12
+> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
13
+
14
+ 1. Do whatever you like with the original work, just don't be a dick.
15
+
16
+     Being a dick includes - but is not limited to - the following instances:
17
+
18
+	 1a. Outright copyright infringement - Don't just copy this and change the name.  
19
+	 1b. Selling the unmodified original with no work done what-so-ever, that's REALLY being a dick.  
20
+	 1c. Modifying the original work to contain hidden harmful content. That would make you a PROPER dick.  
21
+
22
+ 2. If you become rich through modifications, related works/services, or supporting the original work,
23
+ share the love. Only a dick would make loads off this work and not buy the original work's
24
+ creator(s) a pint.
25
+
26
+ 3. Code is provided with no warranty. Using somebody else's code and bitching when it goes wrong makes
27
+ you a DONKEY dick. Fix the problem yourself. A non-dick would submit the fix back.

+ 3
- 2
sonar-project.properties View File

@@ -1,6 +1,7 @@
1 1
 sonar.projectKey=query
2 2
 sonar.projectName=Query Builder
3
-sonar.projectVersion=1.0
3
+sonar.projectVersion=2.5.1
4 4
 sonar.sources=src
5
+sonar.language=php
5 6
 sonar.php.coverage.reportPath=build/logs/clover.xml
6
-#sonar.php.tests.reportPath=build/logs/junit.xml
7
+sonar.php.tests.reportPath=build/logs/junit.xml