Skip to content

Commit c0fd010

Browse files
Merge pull request #10051 from phalcon/2.0.0
2.0.0
2 parents fdec9db + 5e313b4 commit c0fd010

File tree

2,173 files changed

+726491
-521545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,173 files changed

+726491
-521545
lines changed

.gitignore

+185-35
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,198 @@
22
.idea
33
.cproject
44
.project
5+
ext/ltmain.sh
56
unit-tests/engines/*
67
unit-tests/logs/*
7-
unit-tests/cache/*
8-
unit-tests/annotations/cache/*
9-
.deps
10-
.libs/
11-
*~
12-
.DS_Store
13-
*.gcno
14-
*.gcda
8+
build/.deps
9+
build/.libs/
10+
build/Makefile
11+
build/Makefile.fragments
12+
build/Makefile.global
13+
build/Makefile.objects
14+
build/acinclude.m4
15+
build/aclocal.m4
16+
build/autom4te.cache/
17+
build/build/
18+
build/config.guess
19+
build/config.h
20+
build/config.h.in
21+
build/config.log
22+
build/config.nice
23+
build/config.status
24+
build/config.sub
25+
build/configure
26+
build/configure.in
27+
build/install-sh
28+
build/libtool
29+
build/ltmain.sh
30+
build/missing
31+
build/mkinstalldirs
32+
build/modules/
33+
build/phalcon.la
34+
build/phalcon.lo
35+
build/run-tests.php
36+
ext/.deps
37+
ext/.libs/
38+
ext/Makefile
39+
ext/Makefile.fragments
40+
ext/Makefile.global
41+
ext/Makefile.objects
42+
ext/acinclude.m4
43+
ext/aclocal.m4
44+
ext/autom4te.cache/
45+
ext/build/
46+
ext/config.guess
47+
ext/config.h
48+
ext/config.h.in
49+
ext/config.lo
50+
ext/config.log
51+
ext/config.nice
52+
ext/config.status
53+
ext/config.sub
54+
ext/config/.libs/
55+
ext/config/adapter/.libs/
56+
ext/config/adapter/ini.lo
57+
ext/config/exception.lo
58+
ext/configure
59+
ext/configure.in
60+
ext/install-sh
61+
ext/kernel/.libs/
62+
ext/kernel/array.lo
63+
ext/kernel/assert.lo
64+
ext/kernel/concat.lo
65+
ext/kernel/debug.lo
66+
ext/kernel/exception.lo
67+
ext/kernel/fcall.lo
68+
ext/kernel/main.lo
69+
ext/kernel/memory.lo
70+
ext/kernel/object.lo
71+
ext/kernel/operators.lo
72+
ext/kernel/require.lo
73+
ext/libtool
74+
ext/missing
75+
ext/mkinstalldirs
76+
ext/modules/
77+
ext/phalcon.la
78+
ext/phalcon.lo
79+
ext/run-tests.php
80+
unit-tests/views/test10/children.extends.volt.php
81+
unit-tests/views/test10/children2.volt.php
82+
unit-tests/views/test10/children.volt.php
83+
build/gccarch
84+
build/32bits/.deps
85+
build/32bits/.libs/
86+
build/32bits/Makefile
87+
build/32bits/Makefile.fragments
88+
build/32bits/Makefile.global
89+
build/32bits/Makefile.objects
90+
build/32bits/acinclude.m4
91+
build/32bits/aclocal.m4
92+
build/32bits/autom4te.cache/
93+
build/32bits/build/
94+
build/32bits/config.guess
95+
build/32bits/config.h
96+
build/32bits/config.h.in
97+
build/32bits/config.log
98+
build/32bits/config.nice
99+
build/32bits/config.status
100+
build/32bits/config.sub
101+
build/32bits/configure
102+
build/32bits/configure.in
103+
build/32bits/install-sh
104+
build/32bits/libtool
105+
build/32bits/ltmain.sh
106+
build/32bits/missing
107+
build/32bits/mkinstalldirs
108+
build/32bits/modules/
109+
build/32bits/phalcon.la
110+
build/32bits/phalcon.lo
111+
build/32bits/run-tests.php
112+
build/phalcon.o
113+
build/64bits/.deps
114+
build/64bits/.libs/
115+
build/64bits/Makefile
116+
build/64bits/Makefile.fragments
117+
build/64bits/Makefile.global
118+
build/64bits/Makefile.objects
119+
build/64bits/acinclude.m4
120+
build/64bits/aclocal.m4
121+
build/64bits/autom4te.cache/
122+
build/64bits/build/
123+
build/64bits/config.guess
124+
build/64bits/config.h
125+
build/64bits/config.h.in
126+
build/64bits/config.log
127+
build/64bits/config.nice
128+
build/64bits/config.status
129+
build/64bits/config.sub
130+
build/64bits/configure
131+
build/64bits/configure.in
132+
build/64bits/install-sh
133+
build/64bits/libtool
134+
build/64bits/ltmain.sh
135+
build/64bits/missing
136+
build/64bits/mkinstalldirs
137+
build/64bits/modules/
138+
build/64bits/phalcon.la
139+
build/64bits/phalcon.lo
140+
build/64bits/run-tests.php
141+
build/safe/.deps
142+
build/safe/.libs/
143+
build/safe/Makefile
144+
build/safe/Makefile.fragments
145+
build/safe/Makefile.global
146+
build/safe/Makefile.objects
147+
build/safe/acinclude.m4
148+
build/safe/aclocal.m4
149+
build/safe/autom4te.cache/
150+
build/safe/build/
151+
build/safe/config.guess
152+
build/safe/config.h
153+
build/safe/config.h.in
154+
build/safe/config.log
155+
build/safe/config.nice
156+
build/safe/config.status
157+
build/safe/config.sub
158+
build/safe/configure
159+
build/safe/configure.in
160+
build/safe/install-sh
161+
build/safe/libtool
162+
build/safe/ltmain.sh
163+
build/safe/missing
164+
build/safe/mkinstalldirs
165+
build/safe/modules/
166+
build/safe/phalcon.la
167+
build/safe/phalcon.lo
168+
build/safe/run-tests.php
169+
unit-tests/annotations/cache/*.php
15170
*.o
16171
*.lo
17-
*.la
18-
*.so
19172
*.loT
20-
*.in
21-
*.log
22-
*.d
173+
*.gch
23174
.libs
24-
.coverage
25-
parser.out
26-
lemon
27-
build/gccarch
28175
build/t.dSYM/
29176
build/install2
30-
/ext/Makefile
31-
/ext/Makefile.fragments
32-
/ext/Makefile.global
33-
/ext/Makefile.objects
34-
/ext/*.m4
35-
/ext/autom4te.cache
36-
/ext/build
37-
/ext/config.*
38-
/ext/configure
39-
/ext/install-sh
40-
/ext/libtool
41-
/ext/ltmain.sh
42-
/ext/missing
43-
/ext/mkinstalldirs
44-
/ext/modules
45-
/ext/run-tests.php
46-
/ext/coverage
47-
/unit-tests/nbproject/private/
177+
*~
178+
.DS_Store
179+
ext/.DS_Store
180+
ext/mvc/view/engine/volt/parser.out
181+
ext/mvc/view/engine/volt/lemon
182+
.temp/
48183
/vendor/
49184
composer.lock
185+
composer.phar
186+
php-tests/tests/var/logs/*.log
187+
compile-errors.log
188+
compile.log
189+
.vagrant
190+
Vagrantfile
191+
tests/_output/*
192+
build/.gitignore
193+
build/32bits/tests/
194+
build/64bits/tests/
195+
build/README.md
196+
build/install-gentoo
197+
build/safe/tests/
198+
ext/phalcon/mvc/view/engine/volt/lemon
199+
ext/phalcon/mvc/view/engine/volt/parser.out

.gitmodules

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "php-tests/library/Mustache"]
2-
path = php-tests/library/Mustache
3-
url = https://github.com/bobthecow/mustache.php.git
4-
branch = master
5-
2+
path = php-tests/library/Mustache
3+
url = git://github.com/bobthecow/mustache.php.git
64
[submodule "php-tests/library/Twig"]
7-
path = php-tests/library/Twig
8-
url = https://github.com/fabpot/Twig.git
9-
branch = master
5+
path = php-tests/library/Twig
6+
url = git://github.com/fabpot/Twig.git

.travis.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,40 @@
1-
language:
2-
- php
3-
- c
1+
language: php
42

53
php:
64
- 5.3
7-
- 5.3.3
85
- 5.4
96
- 5.5
107
- 5.6
118

9+
cache:
10+
- apt
11+
1212
services:
1313
- mongodb
1414
- memcached
15+
- redis-server
1516

1617
before_install:
18+
- composer --prefer-source install
19+
- composer require phalcon/zephir:dev-master
1720
- ./unit-tests/ci/install_prereqs.sh
1821
- ./unit-tests/ci/setup_dbs.sh
1922

20-
install:
21-
- composer --prefer-source install
23+
#install:
24+
# - composer --prefer-source install
25+
# - composer require phalcon/zephir:dev-master
2226

2327
before_script:
2428
- git submodule --quiet update --init --recursive
25-
- (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -Werror -Wno-error=uninitialized"; phpize && ./configure --silent --enable-phalcon && make --silent -j4 > /dev/null && sudo make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini)
29+
- (cd php-tests/library/Mustache; git checkout master)
30+
- (cd php-tests/library/Twig; git checkout master)
31+
- (cd vendor/phalcon/zephir; ./unit-tests/ci/before_install.sh; ./install)
32+
- ./vendor/bin/zephir generate
33+
- (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -DZEPHIR_RELEASE=1"; phpize && ./configure --enable-phalcon && make --silent -j4 && sudo make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini)
2634
- ulimit -c unlimited || true
2735

2836
script:
29-
- ZEND_DONT_UNLOAD_MODULES=1 $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c unit-tests/phpunit.xml
37+
- ./run-tests.sh
3038

3139
after_failure:
3240
- sudo apt-get -qq install gdb
@@ -37,4 +45,3 @@ notifications:
3745
3846
3947
40-

CHANGELOG

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2.0.0
2+
- Full rewrite of most components in Zephir
3+
- Added Phalcon\Mvc\Micro::error for better handling of exceptions
4+
- Phalcon\Forms\Form::label does not share attributes with the ones that belong to the element
5+
- Added parameter 'params' to set default conditions when retrieving related records
6+
- Added filters "int!" and "float!" that cast values to the respective type
7+
- Filter "alphanum" now uses a regular expression instead of internal functions for better behaviour in 64bits
8+
- Added 'allowEmpty' option in Phalcon\Validation validators to skip validation if the value is empty
9+
- Added Phalcon\Validation::setDefaultMessages to set default values in validators
10+
- Added Phalcon\Validation\Validator\Numericality
11+
- Added events in Phalcon\Di: beforeServiceResolve / afterServiceResolve
12+
- Mysql database introspector now uses DATABASE() as default schema
13+
- Added option to disable cache keys in Cache\Backend\Memcache
14+
- Mvc\View component is now disabled automatically when redirecting using Http\Response
15+
- Mvc\Model::dynamicUpdate now works better as it compares if every field has changed according to its data type
16+
- Added Db\Adapter\Pdo::getErrorInfo() to obtain the last error generated in a PDO connection
17+
118
1.3.4
219
- Fix improper access to \Phalcon\Debug::$_charset (#2840)
320
- Fix segfault in Phalcon\Mvc\Collection when an invalid parameter is passed as conditions
@@ -61,7 +78,7 @@
6178
- Removed final keyword from Model constructor
6279
- #2111 – replacing bindParam to bindValue to avoid unexpected reference changes
6380
- #2002 Tag::linkTo() to allow the addition of query string parameters
64-
- Add `allowEmpty` option to \Phalcon\Mvc\Model\Validator\*
81+
- Added `allowEmpty` option to \Phalcon\Mvc\Model\Validator\*
6582
- Use phalcon_camelize for namesapce Add \Phalcon\Session\Adapter::setId Fixed #1932 Phalcon\Http\…
6683
- #2111 – replacing bindParam to bindValue to avoid unexpected reference changes
6784
- Fix wrong issent() call on non Response objects

0 commit comments

Comments
 (0)