Skip to content

Commit 8cffbb5

Browse files
authored
Merge pull request #3 from pfeilda/develop
Develop
2 parents a6d9e33 + c840c82 commit 8cffbb5

File tree

6 files changed

+38
-23
lines changed

6 files changed

+38
-23
lines changed

.travis.yml

+25-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
language: php
1+
jobs:
2+
include:
3+
- language: php
4+
php:
5+
- 7.3
6+
before_script:
7+
- travis_retry composer install --prefer-source --no-interaction --dev
8+
script:
9+
- XDEBUG_MODE=coverage ./vendor/bin/phpspec run --config=phpspec.yml --no-interaction -v
10+
- language: python
11+
python: 3.9
12+
before_script:
13+
- cd documentation
14+
- pip install -r requirements.txt
15+
script:
16+
- sphinx-build ./ ./_build
217

3-
php:
4-
- 7.3
5-
before_script:
6-
- travis_retry composer install --prefer-source --no-interaction --dev
7-
script:
8-
- XDEBUG_MODE=coverage ./vendor/bin/phpspec run --config=phpspec.yml --no-interaction -v
9-
10-
deploy:
11-
provider: pages
12-
cleanup: false
13-
github_token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable
14-
keep_history: true
15-
on:
16-
branch: main
18+
deploy:
19+
provider: pages
20+
skip_cleanup: true
21+
github_token: $GITHUB_TOKEN
22+
keep_history: true
23+
local_dir: documentation/_build
24+
verbose: true
25+
on:
26+
branch: master

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"serviceprovider"
1111
],
1212
"license": "GPL-3.0-only",
13-
"version": "2.0.1",
13+
"version": "3.0.0",
1414
"require": {
15-
"typo3/minimal": ">=9.5",
15+
"typo3/minimal": ">=9",
1616
"daniel-pfeil/serviceprovider-apache-shib": "^1.1.0"
1717
},
1818
"require-dev": {

documentation/Test.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Test
2+
====
3+
4+
If you want to test the extension without installation of the apache2 saml sp module, you can use the docker-compose
5+
file. You can set the environment variables (normaly set by the apache2 saml sp module) in the Dockerfile.
6+
After a successful startup use `db` as DB Connection and the user/password combination in the docker-compoe file.
7+
Then you can access the installation via `localhost` in your browser.

documentation/index.rst

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
.. TYPO3 SAML Authentication documentation master file, created by
2-
sphinx-quickstart on Wed Nov 14 09:55:18 2018.
3-
You can adapt this file completely to your liking, but it should at least
4-
contain the root `toctree` directive.
5-
61
Welcome to TYPO3 SAML Authentication's documentation!
72
=====================================================
83

@@ -13,6 +8,7 @@ Welcome to TYPO3 SAML Authentication's documentation!
138
Installation.rst
149
Configuration.rst
1510
Usage.rst
11+
Test.rst
1612
BugsAndFeatureRequests.rst
1713

1814
Contribution

documentation/requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
sphinx
2+
t3SphinxThemeRtd

ext_emconf.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
'category' => 'services',
2525
'constraints' => [
2626
'depends' => [
27-
'typo3' => '8.7.0-10.4.14',
27+
'typo3' => '9.0.0-10.4.14',
2828
],
2929
],
3030
'state' => 'stable',

0 commit comments

Comments
 (0)