Commit graph

18509 commits

Author SHA1 Message Date
Larry E. Masters
130e854c30 Adding missing @return tag in function comment 2015-12-13 15:38:39 -06:00
Larry E. Masters
894d233fd6 add @throws anotation to fix travis PHP_CODESNIFFER warnings 2015-12-13 15:16:49 -06:00
Larry E. Masters
6a68032e0b FIxing srand() expects parameter 1 to be integer, string given
Type casting to integer
2015-12-13 14:18:59 -06:00
Larry E. Masters
48e018e707 Allowing tests to run on PHP 7 2015-12-13 14:12:31 -06:00
Richard van den Berg
077f157adf Test case for proxy authentication when request is HTTPS 2015-12-12 11:13:41 +01:00
Mark Story
039bad9d93 Merge pull request #7834 from RichieB2B/fix-ssl-via-proxy
Fix SSL via proxy when hostname has ssl://
2015-12-11 21:50:11 -05:00
Richard van den Berg
ac50b609ac Added space 2015-12-11 15:01:05 +01:00
Richard van den Berg
e315fb6688 Fix proxy authentication when SSL is used 2015-12-11 14:44:46 +01:00
Richard van den Berg
4a4728b44d Fix SSL via proxy 2015-12-11 10:28:53 +01:00
Mark S
b76a235175 Remove default overwrites that are useless 2015-12-08 18:21:51 +01:00
Mark Story
1af5d23e87 Merge pull request #7806 from ravage84/patch-1
Include the Code of Conduct in the 2.x branch
2015-12-07 12:58:20 -05:00
Mark S
dcac9c4a0c Merge pull request #7807 from m1nd53t/2.8-PHP7
Removed last typehint Exception
2015-12-07 16:38:14 +01:00
Kars Frijters
2fdd3030e2 Removed last typehint Exception
#7671 Removed last typehint Exception as it was still giving an uncaught typeError message in PHP7
2015-12-07 16:25:14 +01:00
Marc Würth
d6da07c7a9 Include the Code of Conduct in the 2.x branch
Even though I don't think we need a CoC at all, if we have one, it should be included in all relevant branches.
2015-12-07 12:54:39 +01:00
Mark Scherer
f662b2f5aa Skip error for now. 2015-12-06 12:50:09 +01:00
Mark Story
5852ecec5a Merge pull request #7766 from wiserfirst/split_protocol_from_host
Fixed issue incorrect SNI validation when host name contains protocol for SmtpTransport.
2015-12-02 13:53:17 -05:00
Qing Wu
48dd778bd0 Fixed issue #7579 on the 2.7 branch 2015-12-02 10:24:16 +11:00
Gareth Ellis
7ba19c717e Update docblock for ConsoleOutput::overwrite() $size param 2015-12-01 17:09:42 +00:00
Gareth Ellis
031ae3d105 Use traditional array syntax 2015-12-01 15:37:06 +00:00
Gareth Ellis
d84b6a2c22 Use traditional array syntax 2015-12-01 15:32:54 +00:00
Gareth Ellis
56cfe8492a Use traditional array syntax 2015-12-01 15:32:06 +00:00
Gareth Ellis
3f992695b2 Use traditional array syntax 2015-12-01 15:16:54 +00:00
Gareth Ellis
1bd22e5277 Add test for ConsoleOutputStub 2015-12-01 14:32:59 +00:00
Gareth Ellis
eafee25d13 PHPCS fixes 2015-12-01 14:26:22 +00:00
Gareth Ellis
6b6a90e5c1 Add table shell helper 2015-12-01 13:29:08 +00:00
Gareth Ellis
53b9dc83f6 Add helper method to shell class for loading/fetching helper instances 2015-12-01 13:07:56 +00:00
Gareth Ellis
2854940693 Renamed progress helper files to include Shell to avoid conflicts with existing view helpers 2015-12-01 13:07:32 +00:00
Gareth Ellis
788c57dd4b Add progress helper 2015-12-01 12:03:09 +00:00
Gareth Ellis
e580ad813e Add overwrite method to ConsoleOutput class 2015-12-01 12:01:39 +00:00
José Lorenzo Rodríguez
caf93bf923 Merge pull request #7752 from ichikaway/2.7-remove-extract
remove extract function in the Validation::comparison
2015-11-30 08:50:04 +01:00
Mark Story
6e44930690 Merge pull request #7755 from chinpei215/2.8-test-for-7224
Add test for #7224
2015-11-29 20:48:08 -05:00
chinpei215
415661b18a Fix data type and docblock 2015-11-30 00:02:00 +09:00
chinpei215
f2f8f3f1ea Add test for #7224 2015-11-29 23:38:09 +09:00
Yasushi Ichikawa
bed76acea1 fixed coding standards error 2015-11-29 23:37:07 +09:00
Yasushi Ichikawa
5b098af240 remove extract function in the Validation::comparison 2015-11-29 22:42:55 +09:00
mark_story
7aa6908800 Update version number to 2.7.7 2015-11-22 21:29:57 -05:00
mark_story
7bbdcb207b Merge branch 'memory-fix' into 2.8.
This change automatically increases the memory limit when handling fatal
errors. The intent is to bump the memory limit enough to allow logging
of the fatal error source.

Refs #7224
2015-11-19 21:41:07 -05:00
Mark Story
5ac7b875e9 Merge pull request #7680 from chinpei215/magic-find
Magic call with custom finders
2015-11-15 21:02:18 -05:00
mark_story
48450e71fa Merge branch '2.7' into 2.8 2015-11-11 22:53:45 -05:00
mark_story
7cc163d9b8 Merge branch 'fix-sni' into 2.7
Refs #7675
2015-11-11 22:53:08 -05:00
mark_story
079d15d54f Handle enhanced config in a more graceful way.
HttpSocket further munges the host into a nested array. This config
value should be preferred over the top level host config.

Refs #7675
2015-11-11 22:51:17 -05:00
chinpei215
726699ee7a Magic call with custom finders
Now we can use findListBy, etc - closes #7674
2015-11-11 22:43:19 +09:00
Richard van den Berg
f8e7634131 Use hostname of request instead of hostname of proxy for SNI 2015-11-10 10:54:36 +01:00
José Lorenzo Rodríguez
65b84107a1 Merge pull request #7673 from cakephp/issue-7661
In CLI mode default the error handlers to Console flavors.
2015-11-10 09:38:35 +01:00
mark_story
89d5449270 In CLI mode default the error handlers to Console flavors.
In the somewhat rare case where an error or exception occurs during
application bootstrap, we should not emit HTML to the stdout.

Refs #7661
2015-11-09 21:47:16 -05:00
Mark Scherer
8c5f78bc58 Remove another type hint 2015-11-10 00:32:48 +01:00
Mark Scherer
7982b6b078 Allow ParseError as exception and remove typehint. 2015-11-10 00:14:04 +01:00
Mark Scherer
ddfb7d649e Enable PHP7.0 in travis 2015-11-10 00:11:48 +01:00
mark_story
df3c786f57 Update version number to 2.7.6 2015-11-05 22:30:43 -05:00
mark_story
1a6f733286 Merge branch '27-pages-fix' into 2.7 2015-11-05 22:30:25 -05:00