Browse Source

added updated stuff from github tests

v3-dev
REJack 6 years ago
parent
commit
76c0df7cce
No known key found for this signature in database
GPG Key ID: 4A44B48700429F46
  1. 20
      .gitattributes
  2. 14
      .gitlab-ci.yml
  3. 21
      .travis.yml
  4. 93
      _travis/env
  5. 0
      _travis/env_gitlab
  6. 5
      composer.json

20
.gitattributes vendored

@ -0,0 +1,20 @@
# This file tells which files and directories should be ignored and
# NOT downloaded when using composer to pull down a project with
# the --prefer-dist option selected. Used to remove development
# specific files so user has a clean download.
# git files
.gitattributes export-ignore
.gitignore export-ignore
# helper config files
.editorconfig export-ignore
.travis.yml export-ignore
# They don't want all of our tests...
_travis/ export-ignore
phpunit.yml export-ignore
tests/ export-ignore
# User Guide Source Files
user_guide_src

14
.gitlab-ci.yml

@ -3,14 +3,10 @@
image: rejack/php7-testing-phpunit-ci4:7.2 image: rejack/php7-testing-phpunit-ci4:7.2
before_script: before_script:
- mkdir aauth_temp - shopt -s extglob dotglob && mkdir aauth_temp && mv !(aauth_temp) aauth_temp
- shopt -s extglob dotglob - git clone https://github.com/codeigniter4/CodeIgniter4.git CodeIgniter4 -b ${CODEIGNITER_VERSION}
- mv !(aauth_temp) aauth_temp - cp -r aauth_temp/* CodeIgniter4 && cd CodeIgniter4 && cp _travis/env_gitlab .env
- curl https://codeload.github.com/codeigniter4/CodeIgniter4/zip/v${CODEIGNITER_VERSION} --output CI4.zip - composer install --prefer-source
- unzip CI4.zip
- cp -r aauth_temp/* CodeIgniter4-${CODEIGNITER_VERSION}
- cd CodeIgniter4-${CODEIGNITER_VERSION}
- composer install
# Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
# See http://docs.gitlab.com/ce/ci/services/README.html for examples. # See http://docs.gitlab.com/ce/ci/services/README.html for examples.
@ -22,7 +18,7 @@ variables:
# Configure mysql environment variables (https://hub.docker.com/r/_/mysql/) # Configure mysql environment variables (https://hub.docker.com/r/_/mysql/)
MYSQL_DATABASE: aauth_v3_ci4_testing MYSQL_DATABASE: aauth_v3_ci4_testing
MYSQL_ROOT_PASSWORD: root MYSQL_ROOT_PASSWORD: root
CODEIGNITER_VERSION: '4.0.0-alpha.4' CODEIGNITER_VERSION: 'v4.0.0-alpha.4'
# Run our tests # Run our tests
# If Xdebug was installed you can generate a coverage report and see code coverage metrics. # If Xdebug was installed you can generate a coverage report and see code coverage metrics.

21
.travis.yml

@ -1,7 +1,6 @@
language: php language: php
php: php:
- 7.1
- 7.2 - 7.2
- 7.3 - 7.3
- nightly - nightly
@ -9,7 +8,6 @@ php:
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: 7.3
- php: nightly - php: nightly
global: global:
@ -21,29 +19,20 @@ sudo: required
dist: trusty dist: trusty
group: edge group: edge
env:
- DB=mysqli
- DB=postgres
- DB=sqlite
services: services:
- memcached - memcached
- mysql - mysql
- postgresql
- redis-server
script: script:
- php vendor/bin/phpunit -v - php vendor/bin/phpunit -v
before_install: before_install:
- mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot; - mysql -e "CREATE DATABASE IF NOT EXISTS aauth_test;" -uroot;
- mysql -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'test';" -uroot - mysql -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'aauth_test';" -uroot
- psql -c 'CREATE DATABASE test;' -U postgres
before_script: before_script:
- echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - shopt -s extglob dotglob && mkdir aauth_temp && mv !(aauth_temp) aauth_temp
- git clone https://github.com/codeigniter4/CodeIgniter4.git CodeIgniter4 -b v4.0.0-alpha.4
- cp -r aauth_temp/* CodeIgniter4 && cd CodeIgniter4 && cp _travis/env .env
- composer install --prefer-source - composer install --prefer-source
after_success:
- travis_retry php tests/bin/php-coveralls.phar -v

93
_travis/env

@ -0,0 +1,93 @@
#--------------------------------------------------------------------
# Example Environment Configuration file
#
# This file can be used as a starting point for your own
# custom .env files, and contains most of the possible settings
# available in a default install.
#
# By default, all of the settings are commented out. If you want
# to override the setting, you must un-comment it by removing the '#'
# at the beginning of the line.
#--------------------------------------------------------------------
aauth.dbProfile = 'tests'
aauth.loginRemember = '-1 day'
aauth.dbSoftDeleteUsers = true
aauth.dbSoftDeleteGroups = true
aauth.dbSoftDeletePerms = true
#--------------------------------------------------------------------
# APP
#--------------------------------------------------------------------
# app.baseURL = ''
# app.forceGlobalSecureRequests = false
# app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'
# app.sessionCookieName = 'ci_session'
# app.sessionSavePath = NULL
# app.sessionMatchIP = false
# app.sessionTimeToUpdate = 300
# app.sessionRegenerateDestroy = false
# app.cookiePrefix = ''
# app.cookieDomain = ''
# app.cookiePath = '/'
# app.cookieSecure = false
# app.cookieHTTPOnly = false
# app.CSRFProtection = false
# app.CSRFTokenName = 'csrf_test_name'
# app.CSRFCookieName = 'csrf_cookie_name'
# app.CSRFExpire = 7200
# app.CSRFRegenerate = true
# app.CSRFExcludeURIs = []
# app.CSPEnabled = false
#--------------------------------------------------------------------
# DATABASE
#--------------------------------------------------------------------
# database.default.hostname = localhost
# database.default.database = aauth_test
# database.default.username = travis
# database.default.password =
# database.default.DBDriver = MySQLi
database.tests.hostname = localhost
database.tests.database = aauth_test
database.tests.username = travis
# database.tests.password =
database.tests.DBDriver = MySQLi
#--------------------------------------------------------------------
# CONTENT SECURITY POLICY
#--------------------------------------------------------------------
# contentsecuritypolicy.reportOnly = false
# contentsecuritypolicy.defaultSrc = 'none'
# contentsecuritypolicy.scriptSrc = 'self'
# contentsecuritypolicy.styleSrc = 'self'
# contentsecuritypolicy.imageSrc = 'self'
# contentsecuritypolicy.base_uri = null
# contentsecuritypolicy.childSrc = null
# contentsecuritypolicy.connectSrc = 'self'
# contentsecuritypolicy.fontSrc = null
# contentsecuritypolicy.formAction = null
# contentsecuritypolicy.frameAncestors = null
# contentsecuritypolicy.mediaSrc = null
# contentsecuritypolicy.objectSrc = null
# contentsecuritypolicy.pluginTypes = null
# contentsecuritypolicy.reportURI = null
# contentsecuritypolicy.sandbox = false
# contentsecuritypolicy.upgradeInsecureRequests = false
#--------------------------------------------------------------------
# HONEYPOT
#--------------------------------------------------------------------
# honeypot.hidden = 'true'
# honeypot.label = 'Fill This Field'
# honeypot.name = 'honeypot'
# honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'

0
.env → _travis/env_gitlab

5
composer.json

@ -5,7 +5,7 @@
"homepage": "https://codeigniter.com", "homepage": "https://codeigniter.com",
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": ">=7.1", "php": ">=7.2",
"ext-curl": "*", "ext-curl": "*",
"ext-intl": "*", "ext-intl": "*",
"ext-json": "*", "ext-json": "*",
@ -27,7 +27,8 @@
"scripts": { "scripts": {
"post-update-cmd": [ "post-update-cmd": [
"composer dump-autoload", "composer dump-autoload",
"CodeIgniter\\ComposerScripts::postUpdate" "CodeIgniter\\ComposerScripts::postUpdate",
"bash admin/setup.sh"
] ]
}, },
"support": { "support": {

Loading…
Cancel
Save