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
17632 commits 7 branches 0 tags 44 MiB
Commit graph

17632 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brian Porter
543e520ccb Corrects logic to only apply default filename in **all** cases where none provided. 2014-08-11 10:34:30 -05:00
Brian Porter
6358208e32 Figures it'd be a missing paren. 2014-08-11 09:23:56 -05:00
Brian Porter
be9be48c46 More predictable default for CakeShema class naming. 
Instead of using the `APP_DIR` constant, which may change between developer installations of a project and cause issues loading Schemas generated elsewhere, use a fixed string, 'App'.

This is related to CakeDC/migrations#184 and should fully resolve #4174.
 2014-08-11 09:12:16 -05:00
Brian Porter
f93029b29f SchemaShell always uses --file param when present. 
Addresses **part** of the problem described in #4174.

Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.
 2014-08-11 09:08:59 -05:00
Mark Story
ffefa6425f Merge pull request #4225 from ravage84/php7-uniform-variable-syntax 
Be forward compatible to PHP 7's "Uniform Variable Syntax"
 2014-08-10 22:25:12 -04:00
Marc Würth
120bd37ffa Be forward compatible to PHP 7's "Uniform Variable Syntax" 
https://wiki.php.net/rfc/uniform_variable_syntax
 2014-08-11 01:33:25 +02:00
chinpei215
c246695518 Fix different format of $results in afterFind 
Refs #2529

As of this commit, we can get consistent format of $resutls in afterFind.
And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.
 2014-08-11 01:19:40 +09:00
chinpei215
c227c14bf2 Fix afterFind() called twice with hasMany relationship 
It occurs when a model and the children models are related to a same model.
For example, such as the following:

* User hasMany Comment
* User hasMany Article
* Article hasMany Comment
 2014-08-11 00:12:03 +09:00
mark_story
cb45821c43 Fix reversed arguments in error message. 2014-08-08 23:29:29 -04:00
mark_story
9c3089796f Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Model/Model.php
 2014-08-08 23:28:06 -04:00
mark_story
d114fa1431 Update join building to not error out on empty conditions. 
When conditions are empty we can assume one of two things:

* The person made a mistake.
* The person is doing the join conditions in the where clause.

In both cases we should attempt to generate proper SQL.

Fixes #4189
 2014-08-08 10:02:09 -04:00
José Lorenzo Rodríguez
92957913d9 Merge pull request #4023 from cvo-technologies/2.6-basics-context 
Add the other translation shortcuts for context support
 2014-08-07 08:54:11 +02:00
Mark Story
7c8770d577 Merge pull request #4183 from ravage84/patch-1 
Added links to book
 2014-08-06 20:23:05 -04:00
Marc Würth
49bdde88d2 Added links to book 2014-08-07 01:56:53 +02:00
Mark Story
53447fe2fb Merge pull request #4182 from dereuromark/master-cookie 
Fix cookie reading.
 2014-08-06 17:38:59 -04:00
euromark
5f5218f3b2 Fix cookie reading. 2014-08-06 22:53:54 +02:00