Skip to content

Commit

Permalink
Merge pull request #452 from bakaphp/feature-move-to-baka
Browse files Browse the repository at this point in the history
  • Loading branch information
kaioken authored Jul 3, 2020
2 parents 6db85db + c9cde55 commit 71cec4c
Show file tree
Hide file tree
Showing 168 changed files with 5,408 additions and 8,263 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php
php:
- 7.2
- 7.3
- 7.4
services:
- mysql
- memcached
Expand Down Expand Up @@ -37,7 +37,7 @@ cache:
- "~/cphalcon"
install:
- composer self-update
- cd ~/ && rm -rf cphalcon && git clone -b 3.4.x -q --depth=1 https://github.com/phalcon/cphalcon.git
- cd ~/ && rm -rf cphalcon && git clone -b 4.x -q --depth=1 https://github.com/phalcon/cphalcon.git
&& cd cphalcon/build && ./install
- echo 'extension = "phalcon.so"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
Expand Down
3 changes: 2 additions & 1 deletion codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php

settings:
# The name of bootstrap that will be used.
# Each bootstrap file should be inside a suite directory.
bootstrap: _bootstrap.php
colors: true
# Tests (especially functional) can take a lot of memory
# We set a high limit for them by default.
Expand Down
56 changes: 38 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,60 @@
"email": "[email protected]"
}],
"require": {
"php": ">=7.2",
"ext-phalcon": ">=3.4",
"baka/baka": "^0.5",
"php": ">=7.4",
"ext-phalcon": ">=4",
"baka/baka": "^0.6",
"dariuszp/cli-progress-bar": "^1.0",
"dmkit/phalcon-jwt-auth": "dev-master",
"duncan3dc/fork-helper": "^2.2.0",
"elasticsearch/elasticsearch": "^7.5",
"firebase/php-jwt": "^5.0",
"fzaninotto/faker": "^1.9@dev",
"hybridauth/hybridauth": "dev-master",
"lcobucci/jwt": "^3.2",
"league/flysystem": "^1.0",
"league/flysystem-aws-s3-v3": "^1.0",
"league/fractal": "^0.17.0",
"mark-gerarts/auto-mapper-plus": "2.0.0-alpha1",
"monolog/monolog": "^1.23",
"monolog/monolog": "^2.1",
"namshi/notificator": " 1.0.*",
"nesbot/carbon": "~1.18",
"norkunas/onesignal-php-api": "^1.12",
"phalcon/incubator": "~3.4",
"nesbot/carbon": "^2.3",
"odan/phinx-migrations-generator": "^5",
"phalcon/ide-stubs": "^3.3",
"phalcon/incubator": "4.0.x-dev",
"phalcon/incubator-acl": "^1.0.0-alpha.1",
"php-amqplib/php-amqplib": "^2.9",
"php-http/guzzle6-adapter": "1.1",
"phpstan/phpstan": "^0.9.2",
"phpunit/phpunit": "^9.1",
"psr/log": "^1.0",
"pusher/pusher-php-server": "3.4.1",
"robmorgan/phinx": "0.*",
"pusher/pusher-php-server": "^3.0",
"robmorgan/phinx": "^0.12",
"sentry/sentry": "^1.9",
"sly/notification-pusher": "2.x",
"vlucas/phpdotenv": "^2.4",
"bakaphp/php-apple-signin": "^2.0"
"squizlabs/php_codesniffer": "^3.2",
"stripe/stripe-php": "^7.36",
"swiftmailer/swiftmailer": "^6",
"symfony/browser-kit": "3.4",
"symfony/config": "3.4",
"symfony/console": "3.4",
"symfony/css-selector": "3.4",
"symfony/debug": "3.4",
"symfony/dom-crawler": "3.4",
"symfony/event-dispatcher": "3.4",
"symfony/filesystem": "3.4",
"symfony/finder": "3.4",
"symfony/process": "3.4",
"symfony/yaml": "3.4",
"vlucas/phpdotenv": "^4.1"
},
"require-dev": {
"codeception/verify": "*",
"codeception/codeception": "2.4",
"codeception/codeception": "^4.1",
"codeception/module-asserts": "^1.2",
"codeception/module-cli": "^1.0.0",
"codeception/module-filesystem": "^1.0",
"codeception/module-phalcon": "^1.0",
"codeception/module-phalcon4": "^1.0",
"codeception/module-rest": "^1.2",
"phpstan/phpstan": "^0.9.2",
"squizlabs/php_codesniffer": "^3.2",
"odan/phinx-migrations-generator": "4.*.*"
"squizlabs/php_codesniffer": "^3.2"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 71cec4c

Please sign in to comment.