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

18867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Würth
80788c3c00 Removed use of @version annotation 2014-09-09 23:03:11 +02:00
Mark Story
a7ea5fea78 Merge pull request #4540 from ptica/master 
hardcode a relative path to core installed via composer
 2014-09-09 08:36:14 -04:00
ptica
1959b97ba3 hardcode a relative path to core installed via composer 
as book suggests
 2014-09-08 11:57:01 +02:00
mark_story
734bb9223b Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
 2014-09-06 23:04:20 -04:00
Angel S. Moreno
29570e1d99 Fixed overwriting of files when Folder::SKIP is set 2014-09-06 18:32:45 -04:00
Mark Story
07965d68ff Merge pull request #4507 from rochamarcelo/patch-2 
Changed error message
 2014-09-05 22:04:55 -04:00
rochamarcelo
6a13a1af47 Changed error message 2014-09-05 22:27:02 -03:00
Mark Story
2311c13f12 Merge pull request #4417 from jeremyharris/3331 
Fix for #3331
 2014-09-04 20:26:55 -04:00
Burak USGURLU
996ad04b95 to correctly return SET() type 2014-09-04 18:07:30 +03:00
Jeremy Harris
3a41433c94 Deprecated AuthComponent::mapActions 2014-09-04 08:35:40 -05:00
Mark Story
f82fd2d982 Merge pull request #4463 from ravage84/deprecated-annotaions 
Update all @deprecated annotations
 2014-09-04 08:48:45 -04:00
Mark Story
ee1e2705a2 Merge pull request #4477 from mfn/mfn-console-output-isatty 
console: don't use colored output if there's no TTY
 2014-09-03 07:55:15 -04:00
Markus Fischer
0c55adebe0 console: don't use colored output if there's no TTY 
This prevents ANSI escape codes and style tags showing up in
cron-jobs, pipes or redirects.
 2014-09-03 10:47:05 +02:00
José Lorenzo Rodríguez
b5bfbfcf15 Merge pull request #4223 from chinpei215/2.6-issue2529-fix 
Fix different format of $results in afterFind
 2014-09-03 10:39:37 +02:00
mark_story
638d2ea7b6 Add array cast for method_cache data. 
Fixes #4186
 2014-09-02 22:39:28 -04:00
Marc Würth
67ba9cb406 Update all @deprecated annotations 
to adhere to the @deprecated <version> <description> format, where version and description are mandatory.
 2014-09-02 17:03:22 +02:00
mark_story
9c2a25d4c0 Update version number to 2.5.4 2014-09-01 22:05:27 -04:00
ADmad
d60cd3ab2f Revert "Merge pull request #4405 from php-engineer/master-session-bugfix" 
This reverts commit 5863adda42, reversing
changes made to 4c37cf6d4b.

There was no real issue. The lack of session cookie in CLI makes writing
tests a bit tricky which caused the confusion. Refs #4405, #4451.
 2014-09-01 00:17:53 +05:30
mark_story
7c316bbc56 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/basics.php
 2014-08-30 21:28:11 -04:00
mark_story
c26b381469 Make words ending in data uninflected. 
Since both metadata and word ending in metadata have caused issues in
the past, uninflecting them seems like the best option. This will also
cover cases like ProfileData not being inflected to ProfileDatum which
seems like an improvement to me.

Fixes #4419
 2014-08-30 20:27:37 -04:00
Jeremy Harris
66b2173566 Made AuthComponent::mapActions() act as a getter refs #3331 2014-08-29 08:23:41 -05:00
Mark Story
a5291ae7eb Merge pull request #4429 from jeremyharris/issue-2461 
Clearing HABTM (unique) when HABTM array is empty. Fixes #2461
 2014-08-28 20:29:43 -04:00
Jeremy Harris
2dac6d29c2 Clearing HABTM (unique) when HABTM array is empty, refs #2461 2014-08-28 17:52:13 -05:00
José Lorenzo Rodríguez
4922729432 Merge pull request #4409 from chinpei215/master-issue2268-fix2 
hasOne/belongsTo associations should contain associated records in afterFind
 2014-08-27 09:48:44 +02:00
chinpei215
010bbc6764 Resolve ambiguous column names for Sqlite 2014-08-27 16:06:28 +09:00
chinpei215
c06b7162ef Resolve ambiguous column names 2014-08-27 15:32:57 +09:00
chinpei215
31204832c2 Ensure that afterFind is called when using 'joins' with 'recursive' = -1 2014-08-27 15:16:13 +09:00
chinpei215
b74774bb0c hasOne/belongsTo associations should contain associated records in afterFind 
Before 1fe943d6f1,
afterFind() is called twice with belongsTo/hasOne associations.
Although $results also doesn't contain associated records on first time,
it contains them on second time.

After 1fe943d6f1,
it doesn't work if associated records are used in afterFind.
This commit fixes it.
 2014-08-27 09:32:00 +09:00
Mark Story
5863adda42 Merge pull request #4405 from php-engineer/master-session-bugfix 
CakeSession::delete() bugfix
 2014-08-26 12:43:02 -04:00
Stefan Dickmann
66ccfaf5e2 session bugfix 2014-08-26 17:47:45 +02:00
Mark Story
4c37cf6d4b Merge pull request #4403 from davidyell/patch-6 
Update TagFixture.php
 2014-08-26 11:44:09 -04:00
David Yell
04a8053af6 Update TagFixture.php 
Updated the tag fixture so that it doesn't break `CakeSchema::_arrayDiffAssoc()`
 2014-08-26 14:53:31 +01:00
ADmad
ff3273d8eb Merge pull request #4386 from cakephp/issue-4184 
Fix CURRENT_TIMESTAMP being stored as a default value.
 2014-08-25 21:06:41 +05:30
euromark
cc0acd1556 Fix CS. 2014-08-25 16:54:12 +02:00
mark_story
7936b5e764 Fix CURRENT_TIMESTAMP being stored as a default value. 
When reflecting timestamp columns in MySQL current_timestamp comes back
as the default value. This causes insertion errors later on as
'current_timestamp' is an invalid value for timestamp columns.

Refs #4184
 2014-08-25 11:17:11 +02:00
Mark Story
7a8cb4315e Merge pull request #4366 from hmic/ticket#2707 
Fixed i18n __*() bug
 2014-08-24 17:25:30 +02:00
Hans-Joachim Michl
b4620b4c6c Fixes #2707 
When the first variable argument = null, but there are more arguments given.
Added testcases to show the change (to fail before the fix)
 2014-08-24 14:27:49 +00:00
Mark Story
d99a250050 Merge pull request #4373 from mstra001/master 
fix failing testLogError
 2014-08-24 16:06:32 +02:00
mathieu strauch
85cd11384a fix failing testLogError 2014-08-24 15:46:44 +02:00
mark_story
f0f1531fac Add test for #4309 
The Router internals don't handle // which is good.
 2014-08-24 12:13:05 +02:00
mark_story
cd7438d33d Fix 0 index not being properly parsed for files. 2014-08-23 13:05:16 +02:00
Mark Story
72f62b739e Merge pull request #4353 from karmicdice/patch-1 
Prevent infinite loops by rendering a flash element inside a flash element.

Fixes: #4350
 2014-08-23 12:49:21 +02:00
Karma Dice
f03393a2a3 Preventing multiple iterations 2014-08-23 15:47:12 +05:30
mark_story
4a805af5c6 Merge branch 'master' into 2.6 2014-08-23 09:20:19 +02:00
Mark Story
f6f794eb98 Merge pull request #4331 from jeremyharris/master 
Fix HttpSocket multiple auth requests
 2014-08-22 00:45:08 +02:00
Jeremy Harris
8f420d74fa HttpSocket: not overwriting auth header if it is set in request configuration 2014-08-21 11:24:10 -05:00
Mark Story
3619e81677 Merge pull request #4322 from majna/master-file-engine 
Optimize FileEngine::gc()
 2014-08-21 10:45:10 +02:00
Majna
380ac9e88e Optimize FileEngine::gc() 
SplFileObject constructor throws an exception if the file does not exist or is a directory.
 2014-08-20 23:56:26 +02:00
Mark Story
90499971e0 Merge pull request #4304 from mtak3/ignore_exception_cache_file_engine 
Ignore RuntimeException
 2014-08-20 21:24:39 +02:00
Mark Story
4e4477b840 Merge pull request #4290 from ravage84/plugin-task-folders 
Updated plugin baking task folder list
 2014-08-20 00:38:05 +02:00