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

19648 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mark_story
0400a63004 Forward port fixes for #4294 from 1.3 to 2.x 
CakeTime was broken in the same way as TimeHelper was in 1.x. Getting
1969 on invalid input can be very confusing and un-helpful.

Refs #4294
 2014-08-20 00:25:01 +02:00
euromark
07937d5a5f Correct typo. 2014-08-19 13:49:34 +02:00
mtak3
6b95764619 Ignore RuntimeException 
RuntimeException is thrown at race condition.
However, since for the processing at Garbage Collection, other processes
is determined that the expired.
this process is acceptable to ignore the RuntimeException even if there is
missing file.
 2014-08-19 17:44:25 +09:00
Marc Würth
edc6490f11 Removed Vendor folder from plugin baking task, updated test 2014-08-18 18:55:17 +02:00
Marc Würth
6e1b8f3ce8 Added missing folders to plugin baking task, updated test 2014-08-18 18:54:48 +02:00
ADmad
9d53a1e9ce Merge branch 'master' into 2.6 2014-08-15 12:37:13 +05:30
Mark Story
b5688f069c Merge pull request #4244 from beporter/add-contributing-pointer-to-readme 
Add "contributing" pointers to GitHub readme
 2014-08-12 14:42:39 -04:00
ADmad
c5d1bcfe94 Merge pull request #4245 from beporter/cakeschema-style-guide-updates 
Improve docblock formatting.
 2014-08-12 23:28:59 +05:30
Brian Porter
5c69ac5578 All CakeSchema doc blocks conform to coding standards. 
As laid out here: http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html#typehinting
 2014-08-12 12:55:55 -05:00
Brian Porter
fc852b9316 Style tweak. 2014-08-12 12:20:10 -05:00
Brian Porter
1285a05152 Added additional 3.0 doc link. 2014-08-12 12:16:45 -05:00
Brian Porter
813357f449 Adds a link to the README for people like me that don't spot the CONTRIBUTING.md file in root folder. 2014-08-12 12:11:30 -05:00
Mark Story
f1d01732a5 Merge pull request #4230 from beporter/bug/schemashell-name-file-params-fix 
SchemaShell --name and --file params priority fix.

Fixes #4174
 2014-08-12 12:53:42 -04:00
Brian Porter
4a0f42e179 Doc block capitalization corrections as requested. 2014-08-12 10:48:12 -05:00
Mark Story
4af529e764 Merge pull request #4231 from ceeram/travis 
Slim down travis build matrix
 2014-08-11 15:56:37 -04:00
ceeram
8bec213b5a Update .travis.yml 2014-08-11 19:45:43 +02:00
Brian Porter
7d8d2f2f18 Code sniff fix. 2014-08-11 11:51:09 -05:00
Ceeram
3334bfa455 Slim down travis build matrix 2014-08-11 18:04:35 +02:00
Brian Porter
9b9600fe18 CakeSchema naming fallback. 
Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility.

Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.
 2014-08-11 10:40:57 -05:00