Skip to content

Commit 54babdc

Browse files
committed
Merge branch 'master' into eristich/linked-group-to-usergroup-ref-5774
2 parents 27fa710 + 8289a89 commit 54babdc

File tree

2,110 files changed

+46302
-31308
lines changed

Some content is hidden

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

2,110 files changed

+46302
-31308
lines changed

.codeclimate.yml

Lines changed: 0 additions & 102 deletions
This file was deleted.

.env.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DATABASE_PASSWORD='{{DATABASE_PASSWORD}}'
1919
APP_ENV='dev'
2020
APP_SECRET='{{APP_SECRET}}'
2121
APP_DEBUG='1'
22-
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
22+
TRUSTED_PROXIES=127.0.0.1
2323
#TRUSTED_HOSTS='^(localhost|example\.com)$'
2424
###< symfony/framework-bundle ###
2525

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.github export-ignore
22
.gitattributes export-ignore
33
.gitignore export-ignore
4-
.codeclimate.yml export-ignore
54
.flintci.yml export-ignore
65
.scrutinizer.yml export-ignore
76
.styleci.yml export-ignore

.github/workflows/behat.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on: [push, pull_request]
55
jobs:
66
build:
77
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-24.04
99

1010
strategy:
1111
fail-fast: false
1212
matrix:
1313
operating-system: [ubuntu-latest]
14-
php-versions: ['8.2']
14+
php-versions: ['8.3', '8.4']
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v4
@@ -23,10 +23,12 @@ jobs:
2323
sudo apt-get update
2424
sudo apt-get install nodejs npm apache2 php${{ matrix.php-versions }} php${{ matrix.php-versions }}-common php${{ matrix.php-versions }}-cli libapache2-mod-php${{ matrix.php-versions }}
2525
sudo a2enmod rewrite actions
26-
sudo cp -f .github/gh-apache /etc/apache2/sites-available/000-default.conf
26+
sudo a2dissite 000-default.conf
27+
sudo cp -f ${{ github.workspace }}/.github/gh-apache /etc/apache2/sites-available/000-default.conf
28+
sudo a2ensite 000-default.conf
2729
sudo chmod 777 -R $HOME
28-
cat /etc/apache2/sites-available/000-default.conf
29-
sudo service apache2 restart
30+
cat /etc/apache2/sites-enabled/000-default.conf
31+
#sudo service apache2 restart
3032
sudo systemctl restart apache2
3133
3234
- name: Setup PHP, with composer and extensions
@@ -129,7 +131,7 @@ jobs:
129131
- name: Start mysql service
130132
run: |
131133
sudo /etc/init.d/mysql start
132-
sudo systemctl restart apache2
134+
#sudo systemctl restart apache2
133135
134136
- name: Check PHP settings
135137
run: |
@@ -141,6 +143,7 @@ jobs:
141143
run: |
142144
sudo chmod 777 -R ${{ github.workspace }}
143145
curl http://localhost/main/install/index.php
146+
tail /var/log/apache2/error.log
144147
145148
- name: Install chamilo
146149
run: |

.github/workflows/format_code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88
jobs:
99
build:
1010
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212

1313
strategy:
1414
fail-fast: false

.github/workflows/php_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
55
jobs:
66
build:
77
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-24.04
99

1010
strategy:
1111
fail-fast: false

.github/workflows/phpunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88
jobs:
99
build:
1010
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212

1313
strategy:
1414
fail-fast: false

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ var/upload/*
2626
/config/configuration.php
2727
/main/inc/conf/configuration.php
2828

29+
/config/authentication.yaml
30+
/config/settings_overrides.yaml
31+
/config/plugin.yaml
32+
2933
# Home
3034
components/*
3135

@@ -42,7 +46,7 @@ components/*
4246
nbproject/*
4347

4448
# Plugins config files
45-
public/plugin/bbb/config.vm.php
49+
public/plugin/Bbb/config.vm.php
4650

4751
# Cron temp files
4852
public/main/cron/incoming/*

.php_cs.dist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ $finder = PhpCsFixer\Finder::create()
3939
->exclude('public/main/lp/packaging')
4040
->exclude('public/main/template')
4141
->exclude('public/main/lang')
42-
->exclude('public/plugin/buycourses/src/Culqi')
43-
->exclude('public/plugin/buycourses/src/Requests')
42+
->exclude('public/plugin/BuyCourses/src/Culqi')
43+
->exclude('public/plugin/BuyCourses/src/Requests')
4444
->exclude('public/plugin/vchamilo/cli')
45-
->exclude('public/plugin/pens/lib')
46-
->exclude('public/plugin/bbb/lib')
47-
->exclude('public/plugin/ims_lti')
45+
->exclude('public/plugin/Pens/lib')
46+
->exclude('public/plugin/Bbb/lib')
47+
->exclude('public/plugin/ImsLti')
4848
->exclude('public/plugin/sepe/src/wsse')
49-
->exclude('public/plugin/test2pdf/class')
49+
->exclude('public/plugin/Test2Pdf/class')
5050
->exclude('public/plugin/jcapture/src')
5151
->exclude('public/plugin/jcapture/lib')
5252
->exclude('src/CoreBundle/Traits/Repository/ORM')

.scrutinizer.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ filter:
3636
- 'public/main/lp/packaging/*'
3737
- 'public/main/template/*'
3838
- 'public/main/lang/*'
39-
- 'public/plugin/buycourses/src/Culqi/*'
40-
- 'public/plugin/buycourses/src/Requests/*'
41-
- 'public/plugin/buycourses/src/paypalfunctions.php'
42-
- 'public/plugin/buycourses/src/Requests.php'
39+
- 'public/plugin/BuyCourses/src/Culqi/*'
40+
- 'public/plugin/BuyCourses/src/Requests/*'
41+
- 'public/plugin/BuyCourses/src/paypalfunctions.php'
42+
- 'public/plugin/BuyCourses/src/Requests.php'
4343
- 'public/plugin/vchamilo/cli/*'
44-
- 'public/plugin/pens/lib/'
45-
- 'public/plugin/bbb/lib/bbb_api.php'
46-
- 'public/plugin/ims_lti/OAuthSimple.php'
44+
- 'public/plugin/Pens/lib/'
45+
- 'public/plugin/Bbb/lib/bbb_api.php'
46+
- 'public/plugin/ImsLti/OAuthSimple.php'
4747
- 'public/plugin/sepe/src/wsse/*'
48-
- 'public/plugin/test2pdf/class/*'
48+
- 'public/plugin/Test2Pdf/class/*'
4949
- 'public/plugin/jcapture/lib/*'
5050
- 'public/plugin/jcapture/src/*'
5151
- 'tests/*'

0 commit comments

Comments
 (0)