Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T13578 setup phalcon environment #13628

Merged
merged 231 commits into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from 220 commits
Commits
Show all changes
231 commits
Select commit Hold shift + click to select a range
a9b83e8
Moved tests to temp folder; Added initial boxfile with services
niden Nov 3, 2018
de20ebc
Codeception bootstrap
niden Nov 3, 2018
03fd515
Escaper tests
niden Nov 4, 2018
9f33d89
WIP - Modifying tests
niden Nov 4, 2018
c735b43
[#13578] - Updated docblocks, started work for Config
niden Nov 4, 2018
16d29e3
[#13578] - Adjusted docblocks
niden Nov 4, 2018
3e67799
[#13578] - Added copyright notice; Refactored Config tests
niden Nov 4, 2018
9b890f1
[#13578] - Refactored Debug/Dump tests
niden Nov 4, 2018
290f8f9
[#13578] - Work on Messages
niden Nov 5, 2018
0547022
[#13578] - Refactored Filter tests
niden Nov 5, 2018
f798628
[#13578] - Moved back _ci folder
niden Nov 5, 2018
e7a146e
[#13578] - Refactored Security tests
niden Nov 5, 2018
c46d939
[#13578] - PHPCS fixes
niden Nov 5, 2018
d21e743
[#13578] - Refactored validation messages
niden Nov 5, 2018
18233e7
[#13578] - PHPCS fixes
niden Nov 5, 2018
db780d7
[#13578] - Refactored Text tests
niden Nov 6, 2018
fb66086
[#13578] - WIP Tag test refactoring
niden Nov 6, 2018
8219bcd
[#13578] - Refactored Tag
niden Nov 7, 2018
963a8b1
[#13578] - Corrected tests; Added iconv in the boxfile
niden Nov 7, 2018
5e830d0
[#13578] - Minor refactor in assets; Added Asset Filter tests
niden Nov 9, 2018
25821d5
[#13578] - Added necessary extensions in boxfile. Prepared some tests…
niden Nov 9, 2018
767501f
[#13578] - PHPCS fixes
niden Nov 9, 2018
6c5652b
[#13578] - Test corrections
niden Nov 9, 2018
7002334
[#13578] - Assets refactoring; DiTrait to setup services; Refactoring…
niden Nov 9, 2018
0490055
[#13578] - Added fixtures in the autoloader
niden Nov 9, 2018
f55870f
[#13578] - Refactored Acl tests
niden Nov 9, 2018
10ec6a3
[#13578] - Test corrections
niden Nov 9, 2018
572ff1d
[#13578] - Refactored Forms
niden Nov 10, 2018
07a02a9
[#13578] - WIP - Http\Response Request
niden Nov 11, 2018
cd90931
Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Nov 11, 2018
b6fcae9
[#13578] - Refactored Response tests
niden Nov 11, 2018
4ade42b
[#13578] - Corrected Http tests; Refactored fixtures
niden Nov 11, 2018
c559aa8
[#13578] - Enabled acpu extension; Refactored annotation tests
niden Nov 11, 2018
e2e26ab
[#13578] - PHPCS fixes
niden Nov 11, 2018
0821765
[#13578] - Refactored Logger tests
niden Nov 11, 2018
ef83b9d
[#13578] - Refactored Flash tests
niden Nov 11, 2018
87cf9b8
[#13578] - Refactoring Loader tests
niden Nov 12, 2018
646b2ac
[#13578] - Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Nov 12, 2018
7017cf9
[#13578] - Added zephir in composer for dev - will be reworked later on
niden Nov 12, 2018
16b21f0
[#13578] - Moved old changelogs to the resources folder
niden Nov 12, 2018
a921ec8
[#13578] - Changes to the boxfile to clean up folders
niden Nov 12, 2018
6a10a1f
[#13578] - Work on the dialects and fixtures; Refactored Version tests
niden Nov 13, 2018
8fef029
[#13578] - Refactored Text tests
niden Nov 14, 2018
03c5687
[#13578] - Added test stubs for every method and component of Phalcon…
niden Nov 14, 2018
c4689a0
[#13578] - WIP: Message tests
niden Nov 14, 2018
5d24380
[#13578] - Added zephir dev as a requirement
niden Nov 14, 2018
5e36aec
[#13578] - Minor correction to the test
niden Nov 14, 2018
71d440f
[#13578] - Refactored Messages\Message tests
niden Nov 14, 2018
0b3f9f1
[#13578] - Refactored Messages tests
niden Nov 14, 2018
c6d0fa0
[#13578] - Moved wip folder outside the test structure for the tests
niden Nov 14, 2018
46a5c27
[#13578] - Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Nov 14, 2018
84bd1e3
[#13578] - Work on the Tag tests; Refactored helpers for Tag
niden Nov 14, 2018
988022c
[#13578] - PHPCS fixes and removed Exception test stubs
niden Nov 14, 2018
ca3df2d
[#13578] - Refactoring Tag tests
niden Nov 14, 2018
2281ed4
[#13578] - Refactoring on Translation tests
niden Nov 14, 2018
51fc9f6
[#13578] - More tests added
niden Nov 15, 2018
4450b8a
[#13578] - Added Image/factory; Removed Exception test stubs
niden Nov 15, 2018
b8134b8
Removed unused variables
niden Nov 15, 2018
9866abc
WIP - Assets
niden Nov 15, 2018
b15c450
Refactoring asset inline js
niden Nov 15, 2018
e45a2f1
Moved a lot of tests from the wip/toCheck folders in the main folder.…
niden Nov 16, 2018
214b727
Acl Role/Resource tests; Corrected names for constructor tests
niden Nov 17, 2018
ebfabba
Added Registry tests
niden Nov 17, 2018
00c4c30
Work on the dialect tests
niden Nov 20, 2018
8383a9b
WIP - Db Dialect tests
niden Nov 20, 2018
b283fda
[#13578] - Work on skipped tests and extensionLoaded in the unit tester
niden Nov 22, 2018
5c94d3a
[#13578] - Renamed underscored files for PHPCS
niden Nov 23, 2018
3a4e025
[#13578] - Rename of files with underscore in their names
niden Nov 23, 2018
df2f8d3
[#13578] - Renaming files; Work on Loader/Factory; Work on Cache
niden Nov 23, 2018
876c40a
[#13578] - Reformatting tests (cosmetic); Work on factory tests and b…
niden Nov 23, 2018
a9d24dc
[#13578] - Moved test stubs in unit
niden Nov 23, 2018
ee03535
[#13578] - Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Nov 23, 2018
dc298ac
[#13578] - Skipped a test (will check later)
niden Nov 23, 2018
eca96ce
[#13578] - Initial structure for integration tests; Work on Assets
niden Nov 23, 2018
68f837b
[#13578] - Validation/Validator tests
niden Nov 23, 2018
55e6473
[#13578] - Renamed tests to give better output on console
niden Nov 23, 2018
af00ae4
[#13578] - Test renaming for clarity; Work on validator tests
niden Nov 24, 2018
4f8d81a
[#13578] - Added descriptions for tests for better printout and infor…
niden Nov 24, 2018
ebe3d9c
[#13578] - Added descriptions for Version tests
niden Nov 24, 2018
e297b13
[#13578] - Adding descriptions for tests
niden Nov 24, 2018
ed49b32
[#13578] - Merge 4.0 - Work on Config tests
niden Nov 24, 2018
a139f78
[#13578] - Minor refactor of the validation tests
niden Nov 24, 2018
fe9c0b1
[#13578] - Added comments and output for Text and Tag
niden Nov 24, 2018
72fbd31
[#13578] - Added CLI suite and stubs
niden Nov 25, 2018
d5b6a3c
[#13578] - Enabled unit helper in integration; Moved Db stubs in inte…
niden Nov 25, 2018
3657d37
[#13578] - Work on Version
niden Nov 25, 2018
7015fbd
[#13578] - Comments for all tests; Renamed tests according to namespa…
niden Nov 25, 2018
61f8065
[#13578] - Corrected method names
niden Nov 25, 2018
308bd0d
[#13578] - Corrected docblocks and messages
niden Nov 26, 2018
de9a1bb
[#13578] - Added more tests for __toString
niden Nov 26, 2018
f09b47d
[#13578] - Added crypt trait to check for openssl
niden Nov 26, 2018
009d78c
[#13578] - Restored file I deleted by mistake
niden Nov 26, 2018
58ceaad
[#13578] - Refactored Escaper tests
niden Nov 26, 2018
93988a0
[#13578] - Copyright notices
niden Nov 26, 2018
6e4582c
[#13578] - Added db client libraries in the container
niden Nov 26, 2018
151b093
[#13578] - Work on db tests; Added more packages to the boxfile
niden Nov 26, 2018
28adc13
[#13578] - Added more integration tests; moved fixtures around
niden Nov 26, 2018
f4529aa
[#13578] - Events tests
niden Nov 27, 2018
63e3c72
[#13578] - Added cache and di tests
niden Nov 27, 2018
0234719
[#13578] - Added more tests from the toCheck
niden Nov 27, 2018
388dd80
[#13578] - Removed tests from deprecated projects
niden Nov 27, 2018
43522b0
[#13578] - Removed not needed files; Added pgsql import for nanobox; …
niden Nov 28, 2018
211107d
[#13578] - More DB tests from "unit-tests"
niden Nov 28, 2018
65df2fc
[#13578] - phpcs fixes and optimizations
niden Nov 28, 2018
ec61fd0
[#13578] - Added xcache in nanobox; Moved cache tests from unit-tests
niden Nov 28, 2018
e2d9afc
[#13578] - More tests moved (db from unit-tests)
niden Nov 28, 2018
8ee6292
[#13578] - Moved dbdescribe tests from unit-tests
niden Nov 28, 2018
98b9782
[#13578] - Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Nov 28, 2018
0186dee
[#13578] - Refactored Micro and Router tests; Reorganized assets
niden Nov 29, 2018
cf487ad
[#13578] - Mvc Url and router tests
niden Nov 29, 2018
3e29c5c
[#13578] - Changed "boolean" to "bool" to ensure consistency
niden Nov 29, 2018
baa0be1
[#13578] - Reorganized fixtures for views
niden Nov 29, 2018
1c041fd
[#13578] - Work on the tests; skipped some to check later
niden Nov 29, 2018
88d2425
[#13578] - Added gitkeep to keep the cache folder there in the tests
niden Nov 29, 2018
98b478c
[#13578] - Fixed imports for the dbs for travis
niden Nov 29, 2018
055aa8d
[#13578] - PHPCS fixes
niden Nov 29, 2018
e7d8c6c
[#13578] - DbProfiler unit-test tests
niden Nov 29, 2018
66ef466
[#13578] - Work on models
niden Nov 30, 2018
d25bd4f
[#13578] - Added some debugging code
niden Nov 30, 2018
234f08f
[#13578] - Force disable travis cache for composer
niden Nov 30, 2018
e20230a
[#13578] - Removed zephir from composer; Started using the phar file …
niden Nov 30, 2018
e1c128b
[#13578] - Zephir version 11.6 in travis and boxfile
niden Nov 30, 2018
61b0e57
[#13578] - Test correction
niden Nov 30, 2018
2c81d41
[#13578] - Merge branch 'T13578-setup-phalcon-environment' of git://g…
niden Nov 30, 2018
4199f29
[#13578] - Fixed test path
niden Nov 30, 2018
987bbcf
[#13578] - More corrections to the test
niden Nov 30, 2018
0fb0706
[#13578] - Added namespaces to models
niden Nov 30, 2018
12b4853
[#13578] - Work on the CI and db import scripts
niden Nov 30, 2018
59212e8
[#13578] - Corrections to the tests
niden Nov 30, 2018
51609b9
[#13578] - Added skips for this test
niden Nov 30, 2018
9e900f5
[#13578] - Corrected models namespace
niden Nov 30, 2018
1800585
[#13578] - Corrected some interfaces and implementations
niden Nov 30, 2018
8705515
[#13578] - Removed php 7.0/7.1
niden Nov 30, 2018
296c5b5
[#13578] - Beanstalk tests
niden Nov 30, 2018
6849237
[#13578] - Fixing interfaces
niden Nov 30, 2018
3005d1e
[#13578] - Removed APC, Memcache and XCache adapters (deprecated)
niden Nov 30, 2018
b8fb0bb
[#13578] - Updated changelog
niden Nov 30, 2018
e67f885
[#13578] - Added di setup for view simple
niden Nov 30, 2018
e0ef6b6
[#13578] - Fixing array access
niden Nov 30, 2018
797f106
[#13578] - Simple view tests
niden Nov 30, 2018
5372c4d
[#13578] - Fixed compilation errors
niden Nov 30, 2018
a2bc544
[#13578] - Interface changes
niden Nov 30, 2018
fed2bec
[#13578] - Trying compiling without the return type
niden Nov 30, 2018
2417ca5
[#13578] - Interface corrections
niden Nov 30, 2018
e208abb
[#13578] - Fixing more interfaces
niden Nov 30, 2018
9b6dbb2
[#13578] - Trying to use the NTS version
niden Nov 30, 2018
adb7197
[#13578] - Removed the lines I added before
niden Nov 30, 2018
f95e1fc
[#13578] - Fixed interfaces and compilation errors
niden Nov 30, 2018
65c815b
[#13578] - Changes to travis to reinstall php
niden Nov 30, 2018
e966bae
[#13578] - Triggering another build to install php again
niden Nov 30, 2018
c686d06
[#13578] - More interface changes
niden Nov 30, 2018
6d394d7
[#13578] - Added dots....
niden Nov 30, 2018
12d86f0
[#13578] - Interface corrections
niden Nov 30, 2018
efe2d34
[#13578] - Removed unecessary tests
niden Nov 30, 2018
adc38cc
[#13578] - More interface corrections
niden Nov 30, 2018
710da4e
[#13578] - One more correction to the interfaces
niden Dec 1, 2018
d8f4970
[#13578] - More interface corrections
niden Dec 1, 2018
45bdea6
[#13578] - Restored the folder I deleted by mistake (duh)
niden Dec 1, 2018
1ecc85c
[#13578] - Fixed interfaces for messages
niden Dec 1, 2018
d1b923c
[#13578] - Corrected interface error
niden Dec 1, 2018
227300b
[#13578] - Added missing class
niden Dec 1, 2018
4e62219
[#13578] - More interface corrections
niden Dec 1, 2018
eda69f5
[#13578] - Corrected interface for the session test class
niden Dec 1, 2018
d9ee9f1
[#13578] - Work on the environment variables and codeception
niden Dec 1, 2018
46bbcbd
[#13578] - Moved in the new suite the volt syntax tests; Adjustments …
niden Dec 1, 2018
9d42174
[#13578] - Fixing the environment for Travis
niden Dec 1, 2018
ad73b7c
[#13578] - Removed unecessary copy line
niden Dec 1, 2018
a1b3192
[#13578] - Converted more Router tests
niden Dec 1, 2018
11ec3a2
[#13578] - Adjustment to Travis; Added more fixtures
niden Dec 1, 2018
c1b8b51
[#13578] - Work in volt compiler tests; reorganized delete strategy
niden Dec 1, 2018
c113bcb
[#13578] - Skipping some tests to check travis
niden Dec 1, 2018
1960bd0
[#13578] - Work on namespaces and env variables (again)
niden Dec 1, 2018
cf91195
[#13578] - Added boxfiles for 7.2/3, refacored the env and added env …
niden Dec 1, 2018
2dca4bf
[#13578] - Removed unwanted files; Refactoring of constants and env v…
niden Dec 1, 2018
5264d6e
[#13578] - Added dispatcher tests
niden Dec 2, 2018
f7db0ad
[#13578] - Minor corrections
niden Dec 2, 2018
9baee71
[#13578] - Removing db from the bootstap
niden Dec 2, 2018
198ee3b
[#13578] - Setup for CLI tasks
niden Dec 2, 2018
2bc7f7e
[#13578] - Fixed environment file
niden Dec 2, 2018
2c71b0f
[#13578] - Work in models
niden Dec 2, 2018
7e3c14c
[#13578] - Db\Column tests; work on fixtures/models
niden Dec 2, 2018
225fa0e
[#13578] - Fixing travis sqlite db
niden Dec 2, 2018
ee9a781
[#13578] - Corrected setup db file
niden Dec 2, 2018
23e2e17
[#13578] - Merge from 4.0; Zephir 11.8; Adjusted tests
niden Dec 2, 2018
cbcf310
[#13578] - Added cache folder back
niden Dec 2, 2018
eb32002
[#13578] - Corrected tests
niden Dec 2, 2018
02c9261
[#13578] - Correcting interface
niden Dec 2, 2018
ede6d60
[#13578] - Changed the cache backend "get" lifetime to only accept nu…
niden Dec 2, 2018
1729e3b
[#13578] - Updated the changelog for the cache backend "get" lifetime
niden Dec 2, 2018
6ac4089
[#13578] - Moved Micro test stubs in integration; Added micro collect…
niden Dec 2, 2018
d9f47c6
[#13578] - Corrected the interface
niden Dec 2, 2018
627dc47
[#13578] - Aligned cache interfaces
niden Dec 2, 2018
3793e0d
[#13578] - Corrected controllers in micro collection
niden Dec 2, 2018
c73770f
[#13578] - Reverting changes to cache "get" interfaces
niden Dec 2, 2018
02cc58d
[#13578] - Trying xenial for travis
niden Dec 2, 2018
16cdf44
[#13578] - More interface corrections
niden Dec 2, 2018
50b4b04
[#13578] - Added mysql service in travis
niden Dec 2, 2018
fb517f0
[#13578] - Mysql 5.7 in travis
niden Dec 2, 2018
0cbc426
[#13578] - Corrections to tests and php settings
niden Dec 2, 2018
596137f
[#13578] - Corrected Volt test; Disabled run for integration for now
niden Dec 2, 2018
b51367b
[#13578] - Minor adjustment to the annotations tests
niden Dec 2, 2018
333b744
[#13578] - Change to the reader cest for annotations
niden Dec 2, 2018
72f1a34
[#13578] - More debug output
niden Dec 2, 2018
c80a817
[#13578] - Changes to the environment variables
niden Dec 2, 2018
fd36c3c
[#13578] - Marking some tests skipped to check them later
niden Dec 2, 2018
76534ad
[#13578] - Moved Forms tests in integration; Refactored all the old "…
niden Dec 3, 2018
c14db03
[#13578] - Moved pagination tests to the integration suite
niden Dec 3, 2018
337a9eb
[#13578] - Code quality cleanup
niden Dec 3, 2018
8dfe1c4
[#13578] - Moved Validation to integration suite; Added paginator tests
niden Dec 3, 2018
b6de856
[#13578] - Refactored a lot of MVC tests
niden Dec 3, 2018
7f3ba18
[#13578] - Refactored Session tests
niden Dec 3, 2018
0a09009
[#13578] - Corrections to Tag tests; Reenabled CLI tasks
niden Dec 4, 2018
6026416
[#13578] - Final refactoring (I hope) and removing unused files
niden Dec 4, 2018
facfe4c
[#13578] - Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Dec 4, 2018
b5214b7
[#13578] - Updates to the readme and changelog
niden Dec 4, 2018
61994e1
[#13578] - Corrections based on review
niden Dec 4, 2018
26d2e98
[#13578] - Updated nanobox setup files
niden Dec 4, 2018
6ad2575
[#13578] - Changes based on review
niden Dec 4, 2018
92a581b
[#13578] - Added boxfile to the .gitignore
niden Dec 4, 2018
494f32a
[#13578] - Added more instructions in the tests/README
niden Dec 4, 2018
859e0e1
[#13578] - Merge branch '4.0.x' into T13578-setup-phalcon-environment
niden Dec 4, 2018
9edd819
[#13578] - Updated README; Adjusted tests after the merge
niden Dec 4, 2018
d70a637
[#13578] - Corrected schema file for Postgresql
niden Dec 4, 2018
f0f0069
[#13578] - Minor correction; Zephir 0.11.8
niden Dec 5, 2018
f998341
[#13578] - Triggering the build
niden Dec 5, 2018
359c345
[#13578] - Correction to the case statement
niden Dec 5, 2018
a94cbc6
[#13578] - Corrected something in the file - cannot see what characte…
niden Dec 5, 2018
0be76be
[#13578] - Check env variables
niden Dec 5, 2018
40294f9
[#13578] - Work on the db environment for travis
niden Dec 5, 2018
e1c56a8
[#13578] - Refactored tests to use dataProviders
niden Dec 5, 2018
999f6a7
[#13578] - Added again the travis environment variables
niden Dec 5, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ autom4te.cache/
/vendor
/ide/

boxfile.yml
composer.lock
php_test_results_*.txt
docker-compose.yml
build/gccarch
tests/_cache
34 changes: 21 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,27 @@ php:
- 'master'
- '7.3'
- '7.2'
- '7.1'
- '7.0'

git:
depth: 1

branches:
only:
- master
- /^(4|5)\.\d+\.(\d+|x)$/
# TODO - Remove this when we go deploy this
#branches:
# only:
# - master
# - /^(4|5)\.\d+\.(\d+|x)$/

addons:
apt:
sources:
- mysql-5.7-trusty
packages:
- beanstalkd
- gdb
- lcov
- beanstalkd
- gdb
- lcov
- mysql-server
- mysql-client
postgresql: "9.4"

matrix:
fast_finish: true
Expand All @@ -38,6 +42,7 @@ cache:
- ${HOME}/.local/opt

services:
- mysql
- beanstalkd
- mongodb
- redis-server
Expand All @@ -46,7 +51,7 @@ services:
env:
global:
- CC="gcc"
- ZEPHIR_VERSION="0.10.14"
- ZEPHIR_VERSION="0.11.7"
- RE2C_VERSION="1.1.1"
- REPORT_EXIT_STATUS=1
- REPORT_COVERAGE=1
Expand All @@ -62,8 +67,10 @@ before_install:
- export PHP_VERNUM="$(php-config --vernum)"
- tests/_ci/pear-setup.sh
- tests/_ci/setup-dbs.sh
- source tests/_ci/environment
- export $(cut -d= -f1 tests/_ci/environment)
# - source tests/_ci/environment
# - export $(cut -d= -f1 tests/_ci/environment)
- wget --no-clobber -O $HOME/bin/zephir https://github.com/phalcon/zephir/releases/download/${ZEPHIR_VERSION}/zephir.phar
- chmod +x $HOME/bin/zephir

install:
- tests/_ci/install-prereqs.sh
Expand All @@ -80,7 +87,8 @@ script:
- vendor/bin/phpcs
- vendor/bin/codecept build
# TODO: Add `cli' suite and refactor current cli-tests
- vendor/bin/codecept run -v -n tests/integration/
- vendor/bin/codecept run -v -n tests/cli/
# - vendor/bin/codecept run -v -n tests/integration/
- vendor/bin/codecept run -v -n tests/unit/
# TODO: Refactor legacy unit tests from the "unit-tests" directory
- phpenv config-rm xdebug.ini || true
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG-4.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Added `Phalcon\Mvc\Model\Query\BuilderInterface::offset` [#13599](https://github.com/phalcon/cphalcon/pull/13599)
- Added `Phalcon\Http\Response\Cookies::getCookies` [#13591](https://github.com/phalcon/cphalcon/pull/13591)
- Added `Phalcon\Mvc\Model::isRelationshipLoaded` to check if relationship is loaded
- Added an easy way to work with Phalcon and run the tests locally, using [nanobox.io](https://nanobox.io) [#13578](https://github.com/phalcon/cphalcon/issues/13578)

## Changed
- By configuring `prefix` and `statsKey` the `Phalcon\Cache\Backend\Redis::queryKeys` no longer returns prefixed keys, now it returns original keys without prefix. [PR-13456](https://github.com/phalcon/cphalcon/pull/13456)
Expand All @@ -40,6 +41,7 @@
- Changed `Phalcon\Tag::getTitle()`. It returns only the text. It accepts `prepend`, `append` booleans to prepend or append the relevant text to the title. [#13547](https://github.com/phalcon/cphalcon/issues/13547)
- Changed `Phalcon\Di\Service` constructor to no longer takes the name of the service.
- Changed `Phalon\Tag::textArea` to use `htmlspecialchars` to prevent XSS injection. [#12428](https://github.com/phalcon/cphalcon/issues/12428)
- Changed `Phalon\Cache\Backend\*::get` to use only positive numbers for `lifetime`

## Removed
- PHP < 7.0 no longer supported
Expand All @@ -56,4 +58,12 @@
- Removed `Phalcon\Validation\MessageInterface` and `Phalcon\Mvc\Model\MessageInterface` in favor of `Phalcon\Messages\MessageInterface`
- Removed `Phalcon\Validation\Message` and `Phalcon\Mvc\Model\Message` in favor of `Phalcon\Messages\Message`
- Removed `Phalcon\Validation\Message\Group` in favor of `Phalcon\Messages\Messages`
- Removed deprecated `Phalcon\Annotations\Adapter\Apc`
- Removed deprecated `Phalcon\Annotations\Adapter\Xcache`
- Removed deprecated `Phalcon\Cache\Backend\Apc`
- Removed deprecated `Phalcon\Cache\Backend\Memcache`
- Removed deprecated `Phalcon\Cache\Backend\Xcache`
- Removed deprecated `Phalcon\Mvc\Model\Metadata\Apc`
- Removed deprecated `Phalcon\Mvc\Model\Metadata\Memcache`
- Removed deprecated `Phalcon\Mvc\Model\Metadata\Xcache`

14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ To see what we changed in particular framework branch refer to the relevant chan
## Index

- [**`4.0.x`**](CHANGELOG-4.0.md)
- [**`3.4.x`**](CHANGELOG-3.4.md)
- [**`3.3.x`**](CHANGELOG-3.3.md)
- [**`3.2.x`**](CHANGELOG-3.2.md)
- [**`3.1.x`**](CHANGELOG-3.1.md)
- [**`3.0.x`**](CHANGELOG-3.0.md)
- [**`2.0.x`**](CHANGELOG-2.0.md)
- [**`1.x.x`**](CHANGELOG-1.x.md)
- [**`3.4.x`**](resources/CHANGELOG-3.4.md)
- [**`3.3.x`**](resources/CHANGELOG-3.3.md)
- [**`3.2.x`**](resources/CHANGELOG-3.2.md)
- [**`3.1.x`**](resources/CHANGELOG-3.1.md)
- [**`3.0.x`**](resources/CHANGELOG-3.0.md)
- [**`2.0.x`**](resources/CHANGELOG-2.0.md)
- [**`1.x.x`**](resources/CHANGELOG-1.x.md)
5 changes: 2 additions & 3 deletions codeception.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# can be changed while bootstrapping project
actor: Tester
actor_suffix: Tester

paths:
# where the modules stored
Expand All @@ -23,7 +22,7 @@ settings:

coverage:
# Disable Code Coverage by default to speed up Travis tests
enabled: false
enabled: false

extensions:
enabled:
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,12 @@
"ext-psr": "*",
"ext-xml": "*",
"codeception/codeception": "^2.4",
"codeception/specify": "1.0.*",
"codeception/verify": "1.0.*",
"mustache/mustache": "^2.11",
"phpunit/phpunit": "^6.4",
"predis/predis": "^1.1",
"squizlabs/php_codesniffer": "^3.2",
"twig/twig": "~1.35"
"twig/twig": "~1.35",
"vlucas/phpdotenv": "^2.5"
},
"config": {
"optimize-autoloader": true,
Expand All @@ -59,6 +58,7 @@
"Zephir\\Optimizers\\": "optimizers/",
"Phalcon\\Test\\Unit\\": "tests/unit/",
"Phalcon\\Test\\Integration\\": "tests/integration/",
"Phalcon\\Test\\Fixtures\\": "tests/_data/fixtures/",
"Phalcon\\Test\\Module\\": "tests/_support/Module/",
"Phalcon\\Test\\Listener\\": "tests/_data/listener/",
"Phalcon\\Test\\Db\\": "tests/_data/db/"
Expand Down
9 changes: 6 additions & 3 deletions phalcon/acl/adapter.zep
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,22 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface

/**
* Role which the list is checking if it's allowed to certain resource/access
* @var mixed
*
* @var string
*/
protected _activeRole { get };

/**
* Resource which the list is checking if some role can access it
* @var mixed
*
* @var string
*/
protected _activeResource { get };

/**
* Active access which the list is checking if some role can access it
* @var mixed
*
* @var string
*/
protected _activeAccess { get };

Expand Down
16 changes: 8 additions & 8 deletions phalcon/acl/adapter/memory.zep
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class Memory extends Adapter
* @param array|string accessInherits
* @param RoleInterface|string|array role
*/
public function addRole(role, accessInherits = null) -> boolean
public function addRole(role, accessInherits = null) -> bool
{
var roleName, roleObject;

Expand Down Expand Up @@ -229,7 +229,7 @@ class Memory extends Adapter
* @param array|string accessInherits
* @param RoleInterface|string|array role
*/
public function addInherit(string roleName, var roleToInherits) -> boolean
public function addInherit(string roleName, var roleToInherits) -> bool
{
var roleInheritName, rolesNames, roleToInherit, checkRoleToInherit,
checkRoleToInherits, usedRoleToInherits, roleToInheritList, usedRoleToInherit;
Expand Down Expand Up @@ -313,15 +313,15 @@ class Memory extends Adapter
/**
* Check whether role exist in the roles list
*/
public function isRole(string roleName) -> boolean
public function isRole(string roleName) -> bool
{
return isset this->_rolesNames[roleName];
}

/**
* Check whether resource exist in the resources list
*/
public function isResource(string resourceName) -> boolean
public function isResource(string resourceName) -> bool
{
return isset this->_resourcesNames[resourceName];
}
Expand Down Expand Up @@ -363,7 +363,7 @@ class Memory extends Adapter
* @param Phalcon\Acl\Resource|string resourceValue
* @param array|string accessList
*/
public function addResource(var resourceValue, var accessList) -> boolean
public function addResource(var resourceValue, var accessList) -> bool
{
var resourceName, resourceObject;

Expand All @@ -388,7 +388,7 @@ class Memory extends Adapter
*
* @param array|string accessList
*/
public function addResourceAccess(string resourceName, var accessList) -> boolean
public function addResourceAccess(string resourceName, var accessList) -> bool
{
var accessName, accessKey, exists;

Expand Down Expand Up @@ -581,7 +581,7 @@ class Memory extends Adapter
* @param RoleInterface|RoleAware|string roleName
* @param ResourceInterface|ResourceAware|string resourceName
*/
public function isAllowed(var roleName, var resourceName, string access, array parameters = null) -> boolean
public function isAllowed(var roleName, var resourceName, string access, array parameters = null) -> bool
{
var eventsManager, accessList, accessKey,
haveAccess = null, rolesNames,
Expand Down Expand Up @@ -750,7 +750,7 @@ class Memory extends Adapter
/**
* Check whether a role is allowed to access an action from a resource
*/
protected function _isAllowed(string roleName, string resourceName, string access) -> string | boolean
protected function _isAllowed(string roleName, string resourceName, string access) -> string | bool
{
var accessList, accessKey,checkRoleToInherit, checkRoleToInherits, usedRoleToInherits, usedRoleToInherit;

Expand Down
12 changes: 6 additions & 6 deletions phalcon/acl/adapterinterface.zep
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,30 @@ interface AdapterInterface
/**
* Adds a role to the ACL list. Second parameter lets to inherit access data from other existing role
*/
public function addRole(role, accessInherits = null) -> boolean;
public function addRole(role, accessInherits = null) -> bool;

/**
* Do a role inherit from another existing role
*/
public function addInherit(string roleName, roleToInherit) -> boolean;
public function addInherit(string roleName, roleToInherit) -> bool;

/**
* Check whether role exist in the roles list
*/
public function isRole(string roleName) -> boolean;
public function isRole(string roleName) -> bool;

/**
* Check whether resource exist in the resources list
*/
public function isResource(string resourceName) -> boolean;
public function isResource(string resourceName) -> bool;

/**
* Adds a resource to the ACL list
*
* Access names can be a particular action, by example
* search, update, delete, etc or a list of them
*/
public function addResource(resourceObject, accessList) -> boolean;
public function addResource(resourceObject, accessList) -> bool;

/**
* Adds access to resources
Expand All @@ -100,7 +100,7 @@ interface AdapterInterface
/**
* Check whether a role is allowed to access an action from a resource
*/
public function isAllowed(roleName, resourceName, access, array parameters = null) -> boolean;
public function isAllowed(roleName, resourceName, string access, array parameters = null) -> bool;

/**
* Returns the role which the list is checking if it's allowed to certain resource/access
Expand Down
78 changes: 0 additions & 78 deletions phalcon/annotations/adapter/apc.zep

This file was deleted.

Loading