Skip to content

Commit 5d02f9e

Browse files
authored
Merge pull request #439 from XGProyect/development
XGP 3.2
2 parents ac50199 + 74f47ad commit 5d02f9e

File tree

1,157 files changed

+6104
-5934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,157 files changed

+6104
-5934
lines changed

.github/workflows/php.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: PHP Tests
2+
3+
on:
4+
push:
5+
branches: [ test-ci, xgp-3.2 ]
6+
pull_request:
7+
8+
jobs:
9+
test:
10+
runs-on: ubuntu-20.04
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Validate composer.json and composer.lock
15+
run: composer validate
16+
17+
- name: Install dependencies
18+
run: composer install --prefer-dist --no-progress --no-suggest
19+
20+
# Not fully working at the moment, ignore errors
21+
- name: Run phpunit
22+
run: composer test
23+
continue-on-error: true
24+
25+
- name: Run phplint
26+
uses: overtrue/phplint@2.1.0
27+
with:
28+
path: src/upload/
29+
options: --exclude=*.log
30+
min-version:
31+
runs-on: ubuntu-20.04
32+
steps:
33+
- uses: actions/checkout@v2
34+
35+
- name: Validate composer.json and composer.lock
36+
run: composer validate
37+
38+
- name: Install dependencies
39+
run: composer install --prefer-dist --no-progress --no-suggest
40+
41+
- name: Run phpcompatinfo
42+
run: composer run-script phpcompatinfo

.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22
# application
33
#
44
src/upload/application/config/config.php
5-
src/upload/application/logs/*.txt
5+
6+
#
7+
# writable
8+
#
9+
src/upload/writable/backups/*.sql
10+
src/upload/writable/cache/*.html
11+
/src/upload/writable/logs/*.txt
612

713
#
814
# tests
915
#
16+
src/upload/tests/.phpunit.result.cache
1017
src/upload/tests/build/
1118
src/upload/tests/_reports/
1219

@@ -30,4 +37,4 @@ nbproject/
3037
# composer
3138
#
3239
vendor
33-
composer.lock
40+
composer.lock

README.md

Lines changed: 1 addition & 1 deletion

phpdoc.dist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<phpdocumentor>
3-
<title><![CDATA[XGP Proyect v3.1.0]]></title>
3+
<title><![CDATA[XGP Proyect v3.2.0]]></title>
44
<encoding>utf-8</encoding>
55
<parser>
66
<target>docs</target>
File renamed without changes.

0 commit comments

Comments
 (0)