Skip to content

Commit 46676be

Browse files
authored
Merge pull request #1372 from phalcon/fix/#1370-versions-compatibility
#1370 - Update Phalcon version to 4.0.0-RC.3
2 parents 7bcebd3 + b5bcb4d commit 46676be

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
- DISPLAY=":99.0"
3535
- PHAR_PHP_VERSION=7.2.23
3636
- BOX_VERSION=3.8.3
37-
- PHALCON_VERSION=v4.0.0-rc.2
37+
- PHALCON_VERSION=v4.0.0-rc.3
3838

3939
before_install:
4040
- export PHP_VERSION=$(php-config --version)

bootstrap/autoload.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,13 @@
9999
/**
100100
* Register the Composer autoloader (if any)
101101
*/
102-
if (file_exists(PTOOLSPATH . DS .'vendor' . DS . 'autoload.php')) {
103-
require_once PTOOLSPATH . DS .'vendor' . DS . 'autoload.php';
102+
$vendorAutoload = PTOOLSPATH . DS . 'vendor' . DS . 'autoload.php';
103+
if (!file_exists($vendorAutoload)) {
104+
throw new Exception('Please run composer install');
104105
}
105106

107+
require_once $vendorAutoload;
108+
106109
/**
107110
* Register the custom loader (if any)
108111
*

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
"require": {
2525
"php": ">=7.2",
2626
"ext-pdo": "*",
27-
"ext-posix": "*",
28-
"ext-phalcon": "4.0.0-rc.2",
27+
"ext-phalcon": "^4.0.0-rc.3",
2928
"psy/psysh": "~0.9",
3029
"nikic/php-parser": "^4.2.4",
3130
"phalcon/migrations": "^1.0"

src/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Version extends PhVersion
2727
// phpcs:disable
2828
protected static function _getVersion(): array
2929
{
30-
return [4, 0, 0, 1, 4];
30+
return [4, 0, 0, 2, 2];
3131
}
3232
// phpcs:enable
3333
}

0 commit comments

Comments
 (0)