Mark Story
12f5aee5a2
Merge pull request #7447 from ravage84/2.7-lib-improvements
...
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
e690662f0e
Various improvments to the CakePH Plib files
...
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
Mark Scherer
450a544eb4
Backport 3.x limit of fixture data generation.
2015-09-13 13:12:53 +02:00
mattmemmesheimer
604cb0e48b
Including the FlashComponent by default in the controller when baking.
2015-08-16 17:58:41 -05:00
Mark Story
58bede76d1
Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
...
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
Marc Würth
b412b405f9
Make fixture import from table aware of records found
2015-07-23 18:03:42 +02:00
Mark Scherer
52e79987a2
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-21 10:22:53 +02:00
mark_story
47378427e3
Merge branch '2.6' into 2.7
2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf
Capitalize Windows, the OS
2015-07-09 15:54:03 +02:00
mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
mark_story
9626f0e726
Exclude deprecated validators from bake.
...
Don't include deprecated validators in bake.
Refs #6581
2015-05-22 22:03:32 -04:00
Mark Scherer
f742fa51fe
Dont include deprecated options for bake
2015-05-17 23:24:23 +02:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
ovidiupruteanu
a55685c278
Replace preg_replace with basename in SchemaShell
2015-05-11 14:52:31 +03:00
ovidiupruteanu
4b3386c16f
Replace rtrim with preg_replace in SchemaShell
...
The second parameter of rtrim is a character mask, not a string to be replaced. It was breaking file names ending in one or more 'p' or 'h' characters.
2015-05-11 14:35:20 +03:00
mark_story
3151c53255
Merge branch '2.6' into 2.7
2015-03-23 22:50:09 -04:00
mark_story
5a6a74e2f8
Fix failing tests.
...
The test was taking the wrong index when creating mock path choices.
Refs #6125
2015-03-20 20:35:43 -04:00
Edgaras Janušauskas
b444fe7b81
Do not warn about i18n functions definitions on extract task
2015-03-16 23:16:50 +02:00
Jonas
5f40161e24
2.6.2: cake bake / ModelTask should respect decimal
...
PR for https://github.com/cakephp/cakephp/issues/6066
2015-03-13 21:35:12 +01:00
mark_story
63769ae4a6
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
mark_story
831fe53f79
Ignore LC_TIME category when extracting messages.
...
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.
Refs #5933
2015-02-22 22:39:38 -05:00
ADmad
18246daf17
Merge branch 'master' into 2.7
2015-02-15 21:15:02 +05:30
Markus Fischer
546941a79b
i18n: Remove POT-Creation-Date
...
Prevent app locale files getting marked as modified in VCS even if the actual
content didn't change.
Fixes #5887
2015-02-15 12:38:48 +01:00
mark_story
eb85a875c0
Merge branch 'master' into 2.7
2015-02-10 23:00:43 -05:00
Rachman Chavik
acd32b71fe
Fix: "bake plugin" generates incorrect directory for View/Layouts
2015-02-04 15:47:01 +07:00
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
Edgaras Janušauskas
3ae61e9e16
Fix Extract task to correctly extract messages with context
2014-12-25 14:28:44 +02:00
mark_story
10717d9248
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-23 11:22:00 -05:00
mark_story
5cf5fe53ee
Clarify question.
...
Fixes #1870
2014-12-23 11:18:32 -05:00
mark_story
4d6611b328
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
mark_story
2637d35543
Don't quit bake when a table is missing.
...
When a table is missing print a warning to stderr but don't exit. This
allows people to use `bake fixture all` with non-conventional tables.
Refs #5377
2014-12-15 21:28:55 -05:00
euromark
e1c128bb99
Consolidate with conditions sniff.
2014-12-09 03:17:35 +01:00
euromark
2937ea9ba5
Make comparison stricter.
2014-12-08 11:39:15 +01:00
euromark
f302d8c4d3
Extract being less verbose until explicitly asked for.
2014-12-08 11:36:24 +01:00
mark_story
3095187952
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-11-10 19:38:31 -05:00
mark_story
7718d473c4
Remove singularization on schema class names.
...
Using camelize() does the transformation we want without also
singularizing the name. This makes user input more transparent and fixes
issues around plugin schemas with plural names.
Refs #4993
2014-11-09 21:52:10 -05:00
mark_story
9ce3d89c81
Clean up formatting and make a failure exit non-zero.
...
Console tools should exit non-zero when a comman fails.
Refs #4993
2014-11-09 21:21:42 -05:00
mark_story
b98d2a3365
Merge branch 'master' into 2.6
2014-10-24 22:05:46 -04:00
Bryan Crowe
6f4c3b2765
Fix views overwrite warning text
2014-10-21 14:39:09 -04:00
ADmad
3fb252ad2f
Merge branch 'master' into 2.6
2014-09-13 00:37:16 +05:30
euromark
04ef39217f
Take care of more int casts.
2014-09-10 16:29:23 +02:00
euromark
e77f96d8b7
Use (int) cast instead of intval() function for performance reasons and to unify it.
2014-09-10 15:52:57 +02: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
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
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
Brian Porter
7d8d2f2f18
Code sniff fix.
2014-08-11 11:51:09 -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