adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16900 commits 7 branches 0 tags 44 MiB
Commit graph

5959 commits

Author SHA1 Message Date
ADmad
27699d1f12 Fix auto linking urls with subdomain with underscore. 
Closes #3392
 2014-04-25 22:28:34 +05:30
Mark Story
00be120e7a Merge pull request #3381 from planardothum/shell-requires-cli 
Add check to abort if $argv is undefined.
 2014-04-24 12:32:54 -04:00
Harold Putman
d62e5e1b00 Prevent infinite loop caused when argv not set. 
If shell is invoked with the wrong PHP executable (not CLI) and argv is not an array,  array_search on null causes infinite number of error messages.
 2014-04-24 11:48:19 -04:00
mark_story
9d19801cfa Clear data and validationErrors *after* calling clearCache(). 
Having both properties cleaned after clearCache() means that you can use
the model data in specialized clearCache() implementations.

Fixes #3386
 2014-04-24 09:19:00 -04:00
Stefan Dickmann
f90f718e11 change parameter order 2014-04-24 12:54:45 +02:00
ADmad
971a845eb1 Merge pull request #3379 from dereuromark/2.5-inflector 
2.5 inflector
 2014-04-24 13:13:59 +05:30
mark_story
04edb547f3 Merge branch 'master' into 2.5 2014-04-23 22:21:57 -04:00
mark_story
6f68049bf5 Reject file paths containing ... 
Paths containing `..` are generally up to no good. Throw an exception,
as developers can use realpath() if they really need to get relative
paths.

Fixes #3370
 2014-04-23 22:20:14 -04:00
mark_story
2333c3d535 Update docs for file(). 
Mention that relative paths will be prepended with APP.

Refs #3370
 2014-04-23 22:15:10 -04:00
euromark
0c036f6370 Remove unncessary language support. 2014-04-23 18:07:08 +02:00
euromark
7e6bc48ef2 Complete Inflector transliterations. 2014-04-23 16:43:44 +02:00
ADmad
ead494eec1 Allow setting only default layout without specifying template in email config. 
Closes #3336
 2014-04-22 20:02:36 +05:30
ADmad
6bdfdfd436 Optimize view paths caching for plugins. 
Closes #2047
 2014-04-20 02:02:07 +05:30
mark_story
d54fbe6f60 Merge branch 'master' into 2.5 2014-04-18 22:13:56 -04:00
Carl Sutton
5ac60288fd Fix closing non resource 
I get a load of these errors when running tests in the shell, this check stops the errors from happening

Warning: 2 :: fclose() expects parameter 1 to be resource, integer given on line 298 of CORE\Cake\Console\ConsoleOutput.php
Trace:
fclose - [internal], line ??
ConsoleOutput::__destruct() - CORE\Cake\Console\ConsoleOutput.php, line 298
ToolbarComponent::_saveState() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ToolbarComponent::beforeRedirect() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::redirect() - CORE\Cake\Controller\Controller.php, line 765
AuthComponent::_unauthenticated() - CORE\Cake\Controller\Component\AuthComponent.php, line 364
AuthComponent::startup() - CORE\Cake\Controller\Component\AuthComponent.php, line 304
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::startupProcess() - CORE\Cake\Controller\Controller.php, line 675
Dispatcher::_invoke() - CORE\Cake\Routing\Dispatcher.php, line 182
Dispatcher::dispatch() - CORE\Cake\Routing\Dispatcher.php, line 160
 2014-04-14 14:15:46 +01:00
Bryan Crowe
1a73906a50 Fix failing NoActions comparison test 2014-04-13 23:28:13 -04:00
Bryan Crowe
f7cc0c1802 Add newline after actions in controller template 2014-04-13 21:56:27 -04:00
mark_story
f1b57d14ab Revert changed added in #2750. 
While the had the potential to make 404s going through AssetDispatcher
much faster, they broke plugins + extension routing. While explicit
extensions could be fixed, routing all extensions could not. Because we
are trying to keep 2.x as API compatible as possible it makes sense to
revert the previous changes.
 2014-04-13 20:00:34 -04:00
mark_story
749f2b99d9 Don't 404 extensions that could be handled by routing. 
Fixes an error in #2750 where routed extensions would always return
404's for plugin requests. When a file extenion could be handled by
router, AssetDispatcher cannot 404 the request.

Refs #3305
 2014-04-13 06:48:51 -04:00
mark_story
d4ae2b0b88 Correct types for Validation::range(). 
Refs #3304
 2014-04-13 06:16:24 -04:00
euromark
4f3578ebda Fix CakeHtmlReporter output for HTML 2014-04-12 13:37:36 +02:00
Mark Story
d2fa1b444f Merge pull request #3301 from ubermaniac/Sqlserver-trim 
Trim $sql before checking for SELECT
 2014-04-11 18:48:41 -04:00
Joseph Woodruff
9aeea2fcc3 Trim $sql before checking for SELECT 2014-04-11 15:25:07 -06:00
Stephen Young
b55fa98a2d Updated documentation 
* Removed references to nonexistent `AclBase` class
* Added references to `AclInterface` requirements
 2014-04-11 15:10:56 -04:00
mark_story
6122869d89 Update version number to 2.5.0-RC1 2014-04-10 20:54:20 -04:00
mark_story
bf9c3029cb Merge branch 'master' into 2.5 2014-04-10 20:51:49 -04:00
mark_story
c6173a0054 Add tests for #3288 and remove nested ternaries. 
Nested ternaries are complicated to maintain and hard to read. Break
down the nested ternary into two conditionals.
 2014-04-10 20:37:08 -04:00
Guillaume Lafarge
db450a96e9 Fix Hash type casting 
When using comparison with a boolean, as the filter is a string, we have to convert the data boolean to "boolean string" to avoid type-casting troubles.

## Example
```php
$users = [
    [
        'id' => 2,
        'username' => 'johndoe',
        'active' => true
    ],
    [   'id' => 5,
        'username' => 'kevin',
        'active' => true
    ],
    [
        'id' => 9,
        'username' => 'samantha',
        'active' => false
    ],
];
$unactiveUsers = Hash::extract($users, '{n}[active=false]');
print_r($unactiveUsers);
```

This example returns the two unwanted active users because `"false"` is `true` but not `false` :)

I think this pull request will fix this issue by converting true/false boolean to string (to match with our filter).
 2014-04-10 20:19:32 +02:00
euromark
8e0f15b3d6 Revert the removal of a BC relevant part. 2014-04-10 20:11:58 +02:00
Mark Story
f9a6c1905b Merge pull request #3210 from ubermaniac/Sqlserver-schema-prefix 
Sqlserver schema prefix #3208
 2014-04-09 14:31:09 -04:00
euromark
c321ee5fec correct doc block 2014-04-09 03:07:19 +02:00
euromark
4679a30b37 move cast up 2014-04-08 12:22:29 +02:00
euromark
e948598277 update doc block 2014-04-08 12:19:29 +02:00
euromark
9058f0f6f1 Make CakePlugin::loadAll behave correctly regarding merging of settings. 2014-04-08 12:18:17 +02:00
mark_story
debdc6bccc Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-04-07 21:46:11 -04:00
mark_story
ac66c2c03a Merge branch 'master' into 2.5 2014-04-07 21:45:57 -04:00
Mark Story
bb7b450404 Merge pull request #3260 from dereuromark/2.5-count-dim 
Without any params this method does not make sense
 2014-04-07 21:45:31 -04:00
Mark Story
caf0217fe0 Merge pull request #3259 from dereuromark/2.5-array-merge 
microptimize options and default merge and other string key array merges
 2014-04-07 21:44:38 -04:00
mark_story
b05ab740d6 Merge branch '2.5-AssetDispatcher-404' into 2.5 
Return a 404 much earlier when handling missing theme/plugin assets.

Fixes #2750
 2014-04-07 21:43:37 -04:00
euromark
fdc42a24ca Without any params this method does not make sense 2014-04-08 03:27:45 +02:00
mark_story
513f7bfe86 Cleanup file header. 2014-04-07 21:26:35 -04:00
mark_story
7eb569c439 Add test case for #2750 2014-04-07 21:26:11 -04:00
euromark
a7744e6ff4 a few more corrections 2014-04-08 01:49:33 +02:00
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
euromark
ad5e62515f Use Hash instead of Set class 2014-04-07 03:23:51 +02:00
euromark
cb0ac6f9f3 Add a note to offsetSet() on why it cannot chain. 2014-04-06 22:59:18 +02:00
euromark
6f53529520 Correct doc blocks 2014-04-06 22:27:51 +02:00
José Lorenzo Rodríguez
2dd57c7191 Merge pull request #3246 from cakephp/2.5-event 
Make dispatch return CakeEvent - resolves #2819
 2014-04-06 21:51:48 +02:00
Jose Lorenzo Rodriguez
925db9e25e Revert "Revert "Merge pull request #3002 from moberemk/patch-2"" 
This reverts commit 0d80c92ffb.
 2014-04-06 21:51:03 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2014-04-06 21:50:41 +02:00
Jose Lorenzo Rodriguez
0d80c92ffb Revert "Merge pull request #3002 from moberemk/patch-2" 
This reverts commit 8e3d6cffb7, reversing
changes made to 92800889a6.
 2014-04-06 21:48:59 +02:00
euromark
5d4bb9c2e0 Make dispatch return CakeEvent - resolves #2819 2014-04-06 21:17:51 +02:00
José Lorenzo Rodríguez
8e3d6cffb7 Merge pull request #3002 from moberemk/patch-2 
Allow chaining in the addCrumb method
 2014-04-06 21:09:10 +02:00
mark_story
92800889a6 Update version number to 2.4.7 2014-04-04 22:25:48 -04:00
mark_story
7fb920c256 Add file missed in last commit. 2014-04-04 22:22:38 -04:00
mark_story
4ec81542db Fix email rendering when using 2 different plugins. 
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.

Fixes #3062
 2014-04-04 21:45:04 -04:00
mark_story
b8e21c99ee Only count _id if it is the last 3 characters in the field name. 
This prevents issues when baking models for tables containing `_id`.

Fixes #3230
 2014-04-04 21:26:31 -04:00
euromark
854a53b3cb generalize sentence 2014-04-04 19:19:10 +02:00
euromark
823909603a correct deprecation notices 2014-04-04 19:18:02 +02:00
Saleh Souzanchi
40b7694891 adding options for react to response when asset not exists 2014-04-04 19:50:37 +04:30
Ceeram
5c31641ea8 Change argument type to mixed in docblock, as debug() and pr() accept not just a single type 2014-04-02 23:53:54 +02:00
Joseph Woodruff
8536371501 Sqlserver Datasource how properly appends the schemaName prefix in the describe() method 2014-04-02 13:59:04 -06:00
Joseph Woodruff
d526fdadc1 Base model class no longer changes an already defined schemaName value 2014-04-02 13:58:29 -06:00
José Lorenzo Rodríguez
bf28e69501 Merge pull request #3197 from dereuromark/master-cs 
cs
 2014-04-02 08:32:26 +02:00
euromark
b150e33472 correct missed cs errors 2014-04-02 03:16:03 +02:00
euromark
e544340d67 fix indentation 2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439 more cs 2014-04-02 03:09:42 +02:00
euromark
0d09a54033 more missing doc block tags added 2014-04-02 03:02:37 +02:00
euromark
44952b06a4 cs 2014-04-02 02:23:43 +02:00
Brian Porter
e5dd8acb60 Adds phpunit required version to TestShell "not found" error message. 2014-04-01 11:08:46 -05:00
Bryan Crowe
b93f373f16 Fix yoda condition in File test 2014-03-31 17:40:35 -04:00
mark_story
7419ac35b0 Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-03-30 21:25:19 -04:00
mark_story
f9b45f1b60 Merge branch 'master' into 2.5 2014-03-30 21:24:55 -04:00
Mark Story
11a5a0ae35 Merge pull request #3152 from ADmad/2.5-controller-invoking 
2.5 controller invoking
 2014-03-30 20:50:52 -04:00
ADmad
10f294d6bb Remove $reponse param of Dispatcher::_invoke(). 
Use controller's $response property by default.
 2014-03-30 19:29:07 +05:30
mark_story
d713ff2c6a Correct docblock. 
Refs #3147
 2014-03-29 20:19:34 -04:00
sam-at-github
dbbf6c6ad9 No array short syntax in 2.4\! 2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9 Fixed CS issues. Fixed bug - added missing condition to find. 2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245 on cake acl delete <> delete all matching records. Makes more sense than deleting one of possibly many. 2014-03-29 13:37:08 +11:00
Harold Putman
522b5048f8 Expose canUseMemory 
This lets Fixture be used to create an actual persistent table with InnoDB engine instead of MEMORY.
 2014-03-28 09:24:49 -04:00
sam-at-github
5ceb4abe1a Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better. 2014-03-28 13:35:08 +11:00
mark_story
6bf21c4a43 Update doc blocks to not be lies. 2014-03-27 11:55:54 -04:00
mark_story
c17cc39f08 Update version number to 2.5.0-beta 2014-03-25 21:31:38 -04:00
mark_story
381b3fc9c3 Merge branch 'master' into 2.5 2014-03-25 21:30:56 -04:00
mark_story
ff73229ab8 Fix failing tests. 
Not everyone uses the same database names as me.
 2014-03-24 10:04:19 -04:00
mark_story
2fe8c4050b Insert manual joins *after* generated joins. 
Re-order query joins to make manually added joins be performed after
generated joins. This removes the need to workaround the current join
order, or redefine all association joins when you want to add an
additional join on a leaf table.

Refs #2179
Refs #2346
 2014-03-23 21:09:08 -04:00
mark_story
de9a5a5845 Add deprecated flag to methods that are removed in 3.0. 
A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.

Refs #3105
 2014-03-23 20:40:17 -04:00
func0der
06f47ee01f Introduced I18n category constants (#1894) 
Replaced all hard coded category values
 2014-03-23 17:00:17 +01:00
mark_story
57b8008dbe Merge branch 'master' into 2.5 2014-03-23 11:01:13 -04:00
mark_story
75fcc7c2f8 Don't use count() in a loop. 
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
 2014-03-23 11:00:59 -04:00
Mark Story
dea6709d89 Merge pull request #3014 from ndm2/smtp-extensibility-response-access 
SMTP transport - Extensibility and response access
 2014-03-23 09:24:21 -04:00
Mark Story
90ca41d436 Merge pull request #2941 from lucasff/master 
Allow the passing parameter escape of the getCrumbList method
 2014-03-23 09:23:06 -04:00
mark_story
8acb75425d Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
 2014-03-21 22:55:28 -04:00
mark_story
a801be30d9 Use alternate quoting in assertTags() 
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
 2014-03-21 22:53:25 -04:00
mark_story
f12b272758 Fix a few flaky/bad attribute matchers. 2014-03-21 22:52:52 -04:00
mark_story
af68f61e7a Make assertTags() run much faster. 
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.

Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.

Fixes #3072
 2014-03-21 22:52:52 -04:00
mark_story
c1b2b560bb Fix typo. 2014-03-21 22:52:52 -04:00
mark_story
a827b96804 Clean up doc blocks for assertTags. 2014-03-21 22:52:52 -04:00
James Watts
2eadb89ff6 Update in_array() check to avoid fatal error 
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
 2014-03-21 16:16:32 +01:00
Mark Story
514974900f Merge pull request #3021 from wvdongen/master 
Fixed bug where select query in deleteAll could return wrong table name
 2014-03-21 08:21:24 -04:00