José Lorenzo Rodríguez
74c0e81f1d
Merge pull request #6886 from cakephp/issue-6877
...
Fix greedy regex operators in Postgres driver.
2015-06-25 08:10:22 +02:00
mark_story
2f616a9e0c
Fix greedy regex operators in Postgres driver.
...
`*` is greedy in regex, and needs to be escaped so that SQL operators
don't cause invalid SQL conditions to be created.
Refs #6877
2015-06-24 23:39:26 -04:00
Mark Story
ab2f4c2cd5
Merge pull request #6884 from cakephp/2.7-shell
...
Backport param() access.
2015-06-24 21:45:09 -04:00
Mark Scherer
1c56c723f5
Backport param() access.
2015-06-25 00:52:33 +02:00
Highstrike
8257100f54
How about this?
2015-06-24 15:46:48 +03:00
Highstrike
ef1fc7dfef
PHPCS
2015-06-24 15:18:57 +03:00
Highstrike
833c747b41
Test append PR to Issue
...
This commit fixes #6874
2015-06-24 14:18:14 +03:00
Highstrike
7cdf19363d
Tab instead of space
...
IDE preference
2015-06-24 14:09:32 +03:00
Highstrike
58983f717a
2.7.0-RC Auth doesn't use the new Flash component
...
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
2015-06-24 14:06:35 +03:00
Mark Story
0841c04351
Merge pull request #6853 from cakephp/2.6-template
...
Cleanup method calls.
2015-06-22 10:53:32 -04:00
Mark Scherer
fc57e43a5b
Adjust tests.
2015-06-21 12:13:09 +02:00
mark_story
bf82c95d64
Fix Debugger error output in CLI when Debugger is used as the error handler.
...
Merge changes from #6803 into 2.6.
2015-06-20 22:26:40 -04:00
Humberto Pereira
77150eb6f6
fixed tests cases to print html
2015-06-20 22:19:08 -04:00
Humberto Pereira
26630991a6
CakeShells should not print html in case of a error
2015-06-20 22:19:07 -04:00
Mark Scherer
6e5381a4e3
Cleanup method calls.
2015-06-20 23:27:32 +02:00
mark_story
26b3713bd6
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
2015-06-20 10:03:24 -04:00
mark_story
664ba53c89
Merge branch '2.6' into 2.7
2015-06-20 10:03:14 -04:00
Mark Story
3495ea1bb1
Merge pull request #6849 from cakephp/2.6-template
...
Consolidate template whitespace
2015-06-20 10:01:47 -04:00
Mark Scherer
1d03d5bd59
Consolidate template whitespace
2015-06-20 05:10:35 +02:00
mark_story
705f44e30a
Fix regression where attributes were created with no whitespace.
2015-06-19 22:00:27 -04:00
Mark Story
6ba9d9e8fa
Merge pull request #6830 from cakephp/2.6-templates
...
Remove overhead whitespace in templates.
2015-06-17 08:06:43 -04:00
Mark Story
c7b0d035a4
Merge pull request #6831 from cakephp/2.7-notblank
...
Use strict check
2015-06-17 08:05:00 -04:00
Mark Scherer
4025f2fb22
add cast for clarification and to allow int 0.
2015-06-17 12:38:06 +02:00
Mark Scherer
1b81323462
Use strict check
2015-06-17 12:06:56 +02:00
Mark Scherer
7dedf7f86d
Refactor cleanly.
2015-06-17 11:38:42 +02:00
Mark Scherer
2d7487d33c
img tag needs manual space
2015-06-17 11:34:03 +02:00
Mark Scherer
51d75bc2be
Remove overhead whitespace in templates.
2015-06-17 11:04:04 +02:00
José Lorenzo Rodríguez
8ecda6ba3f
Merge pull request #6821 from cakephp/2.6-radio
...
Allow deep options for radio() just as for select().
2015-06-16 20:41:25 +02:00
mark_story
2d0374e465
Remove 5.2.
...
A bunch of tests fail and its not worth the candle to fix them as 5.2 is
pretty old and dangerous to use.
2015-06-16 09:56:42 -04:00
Mark Scherer
ccac3b3e06
Allow deep options for radio() just as for select().
2015-06-16 13:23:51 +02:00
Mark Story
65b64e0348
Merge pull request #6816 from cakephp/2.6-fix-validation-multiple
...
Fix Validation::multiple() regarding 0 value.
2015-06-15 12:20:13 -04:00
mark_story
97be9b9696
Fix PHPCS errors.
2015-06-15 12:19:20 -04:00
Mark Scherer
86c358f3f9
Fix Validation::multiple() regarding 0 value.
2015-06-15 16:35:27 +02:00
Mark Story
32fe09835b
Merge pull request #6809 from ravage84/2.7-code-coverage
...
Explicit definition of the code coverage
2015-06-15 10:13:12 -04:00
mark_story
c3080873b9
Update version number to 2.7.0-RC
2015-06-14 22:50:05 -04:00
mark_story
0d3057bb77
Re-remove 5.2 from travis.yml
...
There are a bunch of failing tests in the JsonView and HttpSocket
classes, both these failures are caused by annoying differences in PHP
that I don't think are really worth working around.
2015-06-14 22:17:22 -04:00
mark_story
5f9473eb61
Merge branch '2.6' into 2.7
2015-06-14 22:00:37 -04:00
mark_story
0b20f6d334
PHP5.2 has no composer.
2015-06-14 22:00:29 -04:00
mark_story
947262e754
Fix PHPCS errors.
2015-06-14 21:56:48 -04:00
mark_story
ebb01f0fac
Merge branch '2.6' into 2.7
2015-06-14 21:52:53 -04:00
Marc Würth
f3099fefdf
Define code coverage explicitly
2015-06-15 00:56:09 +02:00
mark_story
90da605cc8
Re-enable 5.2 as travis still supports it for now.
2015-06-13 15:48:27 -04:00
mark_story
56143c663e
Update doc blocks for CakePlugin::load().
...
Refs #5665
2015-06-11 22:17:18 -04:00
mark_story
c47196fe08
Merge branch '2.6' into 2.7
2015-06-07 15:45:26 -04:00
mark_story
6d60e6a4db
Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x
...
Backport fixes to base path generation that prevent issue when a URL
contains // it can circumvent the base path generation, which results in
unwanted user data in the base/webroot paths. This creates an
opportunity for CSS manipulation in old versions of IE, and newer ones
via iframe inheritance.
2015-06-07 15:45:16 -04:00
mark_story
0e6fcc02b8
Add/correct some tests for humanize.
...
The arguments for assertEquals() were backwards. While there are many
more flipped assertions I will change the others separately.
2015-06-05 10:31:29 -04:00
mark_story
239c83938f
Fix regression in camelize().
...
The input should not be lowercased before camelizing, as this can cause
inputs that were previously camelized to create incorrect results.
Refs #6735
2015-06-05 10:20:51 -04:00
Mark Story
b8b524392d
Merge pull request #6723 from cakephp/issue-6659
...
Fix issue with overlapping irregular inflections.
2015-06-03 22:10:06 -04:00
mark_story
df0f2295c3
Fix issue with overlapping irregular inflections.
...
When irregular inflections overlap we should choose the longest match,
not the shortest.
Refs #6659
2015-06-02 23:09:29 -04:00
José Lorenzo Rodríguez
9d1db96fa0
Merge pull request #6704 from cakephp/2.7-tree
...
Extract formatTreeList() from generateTreeList().
2015-06-01 21:00:29 +02:00
