Skip to content

Commit

Permalink
Merge 3afdbab into 7543336
Browse files Browse the repository at this point in the history
  • Loading branch information
kilip committed Dec 18, 2020
2 parents 7543336 + 3afdbab commit a56e163
Show file tree
Hide file tree
Showing 321 changed files with 6,605 additions and 3,886 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
/.env.test
/package-lock.json
/composer.lock
features/var

module/Core/test/var/*

#
# General text editors backup files
Expand Down
4 changes: 4 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: yawik/build
tasks:
- init: composer install
command: composer serve
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ matrix:
env: COVERAGE=yes
after_script: *upload-coverage

before_install:
before_install:
- *disable-php-memory-limit
- *disable-xdebug
- *update-pecl-channel
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/cross-solution/YAWIK)

YAWIK
=====

Expand Down
2 changes: 1 addition & 1 deletion behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ default:

gherkin:
filters:
tags: "~@social-profile"
tags: "@travis-exclude"

suites:
user:
Expand Down
46 changes: 28 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,17 @@
"require": {
"php": ">=7.4",
"ext-intl": "*",
"ext-json": "*",
"ext-mongodb": "*",
"alcaeus/mongo-php-adapter": "^1.1",
"doctrine/doctrine-mongo-odm-module": "^1.1",
"doctrine/doctrine-mongo-odm-module": "^3.0",
"ezyang/htmlpurifier": "^4.12",
"hybridauth/hybridauth": "^2.10",
"imagine/imagine": "^1.0",
"jmikola/geojson": "^1.0",
"mpdf/mpdf": "^8.0",
"sebastian/version": "^2.0",
"slm/queue": "^1.0",
"symfony/console": "^3.4 | ^4.1",
"symfony/dotenv": "^3.4 | ^4.1",
"symfony/filesystem": "^3.4 | ^4.1",
"symfony/finder": "^3.4 | ^4.1",
"symfony/process": "^3.4 | ^4.1",
"tracy/tracy": "^2.4",
"yawik/composer-plugin": "^3.0",
"yawik/geo": "^1.1.0",
"laminas/laminas-authentication": "^2.5",
"laminas/laminas-cache": "^2.7",
"laminas/laminas-captcha": "^2.7",
"laminas/laminas-dependency-plugin": "^2.0",
"laminas/laminas-feed": "^2.8",
"laminas/laminas-form": "^2.10",
"laminas/laminas-i18n-resources": "^2.5",
Expand All @@ -75,15 +65,25 @@
"laminas/laminas-mvc-i18n": "^1.0",
"laminas/laminas-mvc-plugins": "^1.0",
"laminas/laminas-navigation": "^2.8",
"laminas/laminas-paginator": "^2.0",
"laminas/laminas-permissions-acl": "^2.6",
"laminas/laminas-progressbar": "^2.5",
"laminas/laminas-recaptcha": "^3.0",
"laminas/laminas-serializer": "^2.8",
"laminas/laminas-servicemanager-di": "^1.1",
"laminas/laminas-session": "^2.7",
"laminas/laminas-view": "^2.9",
"laminas/laminas-recaptcha": "^3.0",
"laminas/laminas-dependency-plugin": "^2.0",
"laminas/laminas-paginator": "^2.0"
"mpdf/mpdf": "^8.0",
"sebastian/version": "^2.0",
"slm/queue": "^1.0",
"symfony/console": "^5.0",
"symfony/dotenv": "^3.4 | ^4.1",
"symfony/filesystem": "^3.4 | ^4.1",
"symfony/finder": "^3.4 | ^4.1",
"symfony/process": "^3.4 | ^4.1",
"tracy/tracy": "^2.4",
"yawik/composer-plugin": "^3.0",
"yawik/geo": "^1.1.0"
},
"require-dev": {
"behat/behat": "^3.2",
Expand All @@ -98,20 +98,26 @@
"laminas/laminas-test": "^3.1",
"mikey179/vfsstream": "^1.6",
"novaway/common-contexts": "~2.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.57",
"phpstan/phpstan-doctrine": "^0.12.22",
"phpunit/phpunit": "^7.5.8",
"se/selenium-server-standalone": "^2.52"
},
"scripts": {
"auto-scripts": [
"./bin/console clear-cache",
"npm install"
"npm install",
"./bin/console migrate"
],
"post-install-cmd": [
"@auto-scripts"
],
"post-update-command": [
"@auto-scripts"
],
"phpstan": "./vendor/bin/phpstan analyse",
"phpunit": "./vendor/bin/phpunit",
"serve": "php -S 0.0.0.0:8080 -t public/ public/router.php"
},
"config": {
Expand All @@ -138,7 +144,8 @@
"Pdf\\": "module/Pdf/src",
"Settings\\": "module/Settings/src",
"ReleaseTools\\": "module/ReleaseTools/src",
"Yawik\\Behat\\": "module/Behat/src"
"Yawik\\Behat\\": "module/Behat/src",
"Yawik\\Migration\\": "module/Migration/src"
}
},
"autoload-dev": {
Expand All @@ -155,6 +162,9 @@
"SettingsTest\\": "module/Settings/test",
"Yawik\\Behat\\": "module/Behat/src",
"ReleaseTools\\": "module/ReleaseTools/src"
},
"psr-4": {
"Yawik\\Migration\\Tests\\": "module/Migration/tests"
}
},
"replace": {
Expand Down
Loading

0 comments on commit a56e163

Please sign in to comment.