Skip to content

Loading…

Edit memcached's website: #384

Closed
wants to merge 306 commits into from
markstory and others added some commits
@markstory markstory Adding more verbose info to connection errors.
The start page now shows the connection exception message.
Fixes #875
50b2535
@ADmad ADmad Moving AppModel, AppController, PagesController out of core to app f2a5811
@ADmad ADmad Fixing DispatcherTest broken by previous commit. 1c19ead
@ADmad ADmad Fixing tests broken by previous commit. 38d7433
@ceeram ceeram Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 479f305
Clément Hallet move 'redirect' to request, and allow to use int values as ttl ecb8879
@ADmad ADmad Moving view for Pages controller from core to app which was missed in…
… earlier commit. Also moving AppHelper.
87f12de
@ADmad ADmad Syncing files between app directory and bake skeleton 233a633
@predominant predominant Fix plugins not being loaded before looking for pluign paths eefdc43
@ceeram ceeram Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 d302dab
@renan renan Merge pull request #314 from challet/HttpSocket_handle_redirect
move 'redirect' to request, and allow to use int values as ttl
1db915f
Daniel Pakuschewski Dropped support for wildcard in AuthComponent::allow()
Conflicts:

	lib/Cake/Controller/Component/AuthComponent.php
841c0c2
@markstory markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
fb7d931
@markstory markstory Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 542e5c9
@ceeram ceeram Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 ece8b57
@markstory markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
fa0ec44
@rchavik rchavik Adding multidb fixture support
CakeTestFixture now has a $useDbConfig property, that is similar
to Model::useDbConfig.  CakeFixtureManager now uses this property
to decide which connection to use.  CakeTestFixture::$created
records datasources it was created on.
a5ac328
@rchavik rchavik Adding tests for loading multischema fixtures 073d049
@rchavik rchavik Display datasource name in exceptions and error page.
When working with multiple databases, it's helpful to display
the datasource name that is requested by a given model.
408e785
@rchavik rchavik Configure ClassRegistry in test mode
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
aab8e98
@lorenzo lorenzo Correctly getting connection configs in CakeSchemaTest 02912b6
@ADmad ADmad Implemented priority based triggering of callbacks for objects in col…
…lection
90b007e
@petteyg petteyg Make App::path('Console') overwrite App::core('Console') for themes 99e6072
@ceeram ceeram Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2da45df
@AD7six AD7six allow creating models without the table existing
particularly useful/appropriate for schemaless datasources
ac8e1e8
@AD7six AD7six allow baking models with missing tables - even for rdbms
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
8e38f66
@AD7six AD7six code standards f0fa6c7
@markstory markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
21cd3f0
@AD7six AD7six prevent missing-index notices
when baking with a schemaless db
43ae7af
@AD7six AD7six Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 d2514f3
@AD7six AD7six another bulletproofing for schemaless baking adf73ab
@ceeram ceeram Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 9b48c54
@rchavik rchavik Enable short option for --plugin and --connection
This is done to make things more consistent with the bake shell
211146f
@lorenzo lorenzo Merge pull request #332 from rchavik/schema-shell
Enable short option for --plugin and --connection
7e790aa
@rchavik rchavik Removing timestamp lines from generated files
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
fa80be5
@rchavik rchavik Adding new property Model::schemaName
Just like physical table name, the schema name is an important information
that should be available in models.  The property will be populated accordingly
by the model's datasource.
144b556
@rchavik rchavik Use the correct datasource when saving multiple model fd07b96
@rchavik rchavik Adding cross schema test c4cbf1c
@rchavik rchavik set schemaName for joinTable object in TranslateBehavior 813ecb6
@rchavik rchavik In a multidb habtm, we cannot rely on 'joinTable'
Instead, we should use value from 'with' when it's available.
2048518
@rchavik rchavik fixing broken tests: updating fullTableName() use
At the same time, reversing arguments since phpunit wants 'expected' as
the first parameter.
1f7c292
@rchavik rchavik fixing broken tests: update expected regex pattern 1677e87
@rchavik rchavik removing 'id' from fixtures (lh ticket 2296) 6874e49
@markstory markstory Starting content type specific error pages.
- Adding RequestHandler to the error controller.  This allows reuse
  of all of Cake's internals.
- Adding a simple JsonView class to do serialized JSON views.
- Adding serialize hooks, and wiring things together.
cfbc436
@jrbasso jrbasso Not loading helpers and others stuffs not necessary to Json view. Tes…
…ts added.
8734890
@jrbasso jrbasso Removing unnecessary code. e737845
@jrbasso jrbasso Added XmlView. a6c1aaf
@markstory markstory Fix parse error when short tags are on. b20803b
@markstory markstory Fix casing of vars in tests. c64e41e
@markstory markstory starting to refactor views.
Adding comments.
Incomplete.
011fd51
@markstory markstory Making JsonView work more like the XmlView. 5e9b158
@markstory markstory Make XmlView consistent with JsonView.
Both allow a view script or a serialize key with the name
of the variable to be serialized.
c1f5dc1
@markstory markstory Update RequestHandler tests for new View classes. b0d0e06
@markstory markstory Limit what exceptionrenderer outputs.
The exception object should not be part of production errors.
d9482fe
@markstory markstory Adding support for array serialize values.
Using an array for 'serialize' gives a set of view vars
to convert into the view output.
50ec08f
@markstory markstory Fix errors found in review. 04463c4
@markstory markstory Change serialize to _serialize
Its possible that a developer would use 'serialize' as a legitimate
view variable.  Prefix with an _ to minimize that.
6e1b1df
@markstory markstory Call parent::__construct so helpers are available. cff980b
@ceeram ceeram Fixing modeltask to use correct table
ModelTask will now bake correct primaryKey when not id
57a1a28
@markstory markstory Checking types before calling methods. 168c6f1
@markstory markstory Fixing failing tests. a56ad0c
@markstory markstory Merge pull request #335 from rchavik/remove-timestamp-lines
Removing timestamp lines from generated files
8dd9846
@lorenzo lorenzo Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 76e334c
@andraskende andraskende removing $i as its no longer being used here. (probably was used befo…
…re on zebra striping.)
4f64a9f
@ADmad ADmad Merge pull request #341 from andraskende/master
removing $i as its no longer being used here.
c653d83
@predominant predominant Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 af2e7c1
@renan renan Trying to take into account the number of days in a month. 8568ac6
@markstory markstory Fix incorrect alias/name usage.
Fixes #2317
992a155
@markstory markstory Fix return values in Cache.
The documentation indicates that false/or the value will be returnned.
Using both null and false to indicate failure is confusing.  Use only
false to indicate failure.  It might be better in the future to use
exceptions for trying to read/write on missing cache configs.
7f68699
@shama shama Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session …
…helpers
1d50562
@lorenzo lorenzo Merge pull request #342 from shama/patch-doc
Add @link to helper docblocks
32a3737
@shama shama Adhering to coding standards 5876744
@markstory markstory Merge pull request #343 from shama/patch-standards
Adhering to coding standards
87a8af4
@ceeram ceeram Fixing cascading delete, when using foreignKey false and setting cond…
…ition on hasOne.
b5c4b85
@majna majna Add visibility keyword for 'helpers' property in controller template. 87a3937
@ADmad ADmad Merge pull request #344 from majna/2.0-controller-template
Add visibility keyword for 'helpers' property in controller template.
166e03e
@markstory markstory Fix build, I'm a dork. 4b292b1
@markstory markstory Adding set to autoloader.
Fixes #2319
65b87af
@markstory markstory Fix cachefiles being generated with "
Cache files with SQLite should not contain "

Fixes #2323
49708ec
@shama shama Adhere to code formatting standard 94e119f
@ceeram ceeram Merge pull request #345 from shama/patch-standards
Adhere to code formatting standard
95e8f1d
@ceeram ceeram adding default name, for dbs that dont expose a PK 0a1772c
@ceeram ceeram Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 faddfbe
@markstory markstory Fix theme files with spaces in them.
Fixes #2324
79d6a85
@markstory markstory Fix issue with nested named parameters.
Nested named parameters were not being correctly flattened.

Fixes #2329
8b3c72f
@markstory markstory Fix double inflection in bake all <foo>
ViewTask re-pluralizes the model name.  Sometimes this leads to
things like Menuses which is totally wrong.

Fixes #2318
0f71254
@petteyg petteyg Merge branch 'master' into apptheme a800dcb
@shama shama Spelling and grammar fixes 8197f87
@lorenzo lorenzo Merge pull request #349 from shama/patch-spelling
Spelling and grammar fixes
ff8eb2b
@shama shama Always set ControllerTestCase::testAction result variables 4174ddf
@markstory markstory Merge pull request #350 from shama/patch-controller-test-case
Always set ControllerTestCase::testAction result variables
f58d28a
@markstory markstory Merge pull request #348 from petteyg/apptheme
Make TemplateTask prioritize App templates over Core templates
d4fd1b3
@markstory markstory Fix missing directory in dispatcher with rewrite off.
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.

Fixes #2330
22352a0
@markstory markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
6d269ce
@dereuromark dereuromark Test suite should display current PHPUnit version.
Fixes #2316
73de68f
@markstory markstory Fix bad merge. 545f4d2
@markstory markstory Fix issue with incorrect date handling.
Fixes #2321
0670b96
@markstory markstory Move viewVars assignment after callbacks.
Assigning the controller viewVars after callbacks
allows the controller callbacks to assign additional
viewVars, or manipulate existing ones.

Fixes #2335
457dd73
@markstory markstory Unskip some tests. 71b41ed
@markstory markstory Adding SecurityComponent::generateToken()
This method allows end developers to add the csrf tokens
manually, if they aren't added automatically.

Tokens are cheap to generate, simplifying the logic
makes things a bit easier to understand.
e421b3b
markstory and others added some commits
@markstory markstory Merge pull request #372 from shama/patch-controller-test-case
Fix overreaching Inflector when ControllerTestCase autoMocks
4a1a46a
@markstory markstory Fix multiple date formats in Validation::date()
Fixes #2364
645ef47
@shama shama Correcting assertEquals parameter order b46c4b3
@ceeram ceeram Merge pull request #373 from shama/patch-test-case-order
Correcting assertEquals parameter order
276ae15
@shama shama Update api link to 2.0 on default home page 5110b97
@rchavik rchavik Merge pull request #273 from rchavik/#275
Fixes #275 (lighthouse) Old HABTM links should not be deleted when new HABTM links contain these
8444911
@rchavik rchavik updating usage of assertEqual -> assertEquals a88ca54
@rchavik rchavik updating multidb tests to use ConnectionManager d77f9aa
@lorenzo lorenzo Merge pull request #374 from shama/patch-api-link
Update api link to 2.0 on default home page
0b7d0d7
@rchavik rchavik fixing conflict resolution in 2e8498e re: pgsql 6505dd8
@markstory markstory Fix error in FixtureTask
The options are always set, use empty() instead.

Fixes #2373
dd335cb
@markstory markstory Moving tests and un-skipping them.
Adding tests for proper field quoting in conditions.
Closes #2369
8d1edd7
@markstory markstory Fix lies in Shell::createFile()
It could lie if the file was not writable.

Fixes #2371
b61e3e0
@markstory markstory Merge branch '2.0' into 2.1 07a2a60
@markstory markstory Fix failing tests. cfb6ed4
@predominant predominant Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 d831159
@shama shama Add test for Model::getID(), simplify return and remove dated @see link 060e225
@shama shama Fix typo on TranslateBehavior error message e6e0027
@rchavik rchavik fixing previous incomplete fix d2eac08
@rchavik rchavik fix fullTableName duplicate prefix, closes #2355 a8d0447
@markstory markstory Merge pull request #376 from shama/patch-getid-test
Add test for Model::getID(), simplify return and remove dated @see link
df3759c
@markstory markstory Merge pull request #377 from shama/2.0
Fix typo on TranslateBehavior error message
102b96f
@dereuromark dereuromark Fix missing App::uses() added
Fixes #2374

Signed-off-by: mark_story <mark@mark-story.com>
9d6ea57
@ADmad ADmad Making Folder::delete() code more PHP5ish 16d29a8
@ADmad ADmad Fixing possible test case failure 01b0431
@ceeram ceeram Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 e4d7ebf
@ceeram ceeram remove cheating, sort() always returns true 3f89346
@shama shama Add debug flag to flush output b339653
@rchavik rchavik include schema name when storing in _sequenceMap 577225b
@shama shama Code formatting 54ed278
@markstory markstory Merge pull request #378 from shama/patch-debug-flag
Add debug flag to flush output
33773a9
@markstory markstory Merge pull request #379 from shama/patch-code-formatting
Patch code formatting
4ed2185
@lorenzo
CakePHP member

Is this documented? :p

CakePHP member

Not yet. I don't really get why people use the webrunner anymore, but that's just me.

Is there any chance to make the ob_flush() activated by default when running tests from web? I think it would be more consistent with previous versions of Cake. Most people expect to see pr(), echo() and debug() showed on screen and when that doesn’t happens we have to search a lot before to know what’s happening. Thanks!

CakePHP member

One drawback to outputting directly is you cannot send headers/cookies/sessions which makes it no different than using the command line runner.

@markstory markstory Fix incorrect value being stored in Auth.redirect.
An incorrect value would be stored in Auth.redirect when
a custom route with the `pass` key set.

Fixes #2366
321caf6
@ADmad

Hmm, "here" includes the url base, so if the app is running in a subfolder when this session value is used for redirection the url base would be added twice I think.

CakePHP member

It was working on my test setup which was in a sub-dir.

CakePHP member

Ignore my comment in that case :)

markstory and others added some commits
@markstory markstory Fix failing tests.
Remove duplicated test.
f1b566b
@shama shama Code standards formatting 51f9837
@shama shama More code standards formatting d794084
@renan renan Merge pull request #380 from shama/patch-code-standards
Code standards formatting
1f8f2ce
@markstory markstory Remove un-used variable.
Fixes #2382
78325a1
@markstory markstory Adding test for CacheHelper.
Refs #2381
a71b0f9
@markstory markstory Make dispatcher::cached() use here()
This allows separate cache files to be created
for different query parameters.

Fixes #2381
e05d7d1
@ADmad ADmad Adding missing Model::create() when using Model::save() in a loop. Fi…
…xing some code formatting. Fixes #848
248a2d3
@markstory markstory Adding tests for Blocks in View.
Blocks should replace scripts_for_layout and content_for_layout
in a future version of CakePHP.
3e2bde5
@markstory markstory Implementing basic features of view 'blocks' 9107913
@markstory markstory Deprecating addScript() its replaced by blocks feature.
Adding View::blocks() for getting the list of blocks.
bd4ee41
@markstory markstory Updating HtmlHelper and its tests to use View::append(). 4606ea3
@markstory markstory Adding Backwards compatibility for $scripts_for_layout. 6d425df
@markstory markstory Updating block appending to work better. 90f035c
@markstory markstory Add View::getBlock()
View::get() had two jobs.  That's almost always a bad thing.
Add a new method instead.
7854f9d
@markstory markstory Updating HtmlHelper to allow custom blocks.
Adding tests for blocks.
Adding missing tests.
82139fe
@markstory markstory Renaming methods so they are shorter and still make sense. b866c00
@markstory markstory Starting the extend() feature.
Adding a simple test case.
Still need to add callbacks around every view fragment rendered.
Without that CacheHelper will not be able to cache extended views
correctly.
b6919a0
@markstory markstory Adding view files for tests.
Adding test case for elements + extending
Making elements extend each other.
e06895e
@markstory markstory Extracting ViewBlock from View.
View was getting too fat.
9b2fd8f
@markstory markstory Adding constants and a property to track the current type.
This helps with resolving parent elements.
d8c6594
@markstory markstory Adding new callbacks - testing them out. 3fe7956
@markstory markstory Adding new callbacks into View. c49e261
@markstory markstory Deprecating View::$output.
Replacing it with a magic __get/__set to the content block.
This helps deprecate $content_for_layout as well.
44a8d79
@markstory markstory Fixing failing tests. c5c2859
@markstory markstory Making modParams work with non-array values.
All but true, false, null will replace the parameter now.
This allows modification of string and object parameters.
39b1203
@markstory markstory Re-factoring duplicated code out. dcf8c0f
@markstory markstory Making afterViewFile callbacks able to modify the rendered content
CacheHelper will need this.
a8f0eb2
@markstory markstory Doing some internal re-factoring in CacheHelper.
cache() should only do one thing.
It shouldn't do more work than is necessary each time its called.
Flatten some of the conditions by extracting methods.
fb20841
@markstory markstory Make CacheHelper able to handle nocache tags in elements.
Using afterRenderFile() instead of afterRender() allows
CacheHelper to parse content in elements and extended views.
bcb8444
@markstory markstory Fix a few outstanding issues with blocks.
- Blocks left open after rendering files should trigger
  an exception.
- Fix strict errors.
- Correct doc blocks.
f0f3eb9
@markstory markstory Adding tests and functionality for nested blocks. 46bb6c8
@markstory markstory Update default layouts to use blocks. 0b0a69d
@markstory markstory Update doc blocks. 3b57704
@markstory markstory Fix failing test in Debugger test case. e9779e7
@markstory markstory Fix various failing tests. 0607437
@ADmad ADmad Added test case for TreeBehavior::recover(). Refs #2392 1358af7
@ADmad
CakePHP member

Silly me :) No matter how many years you work with php will never remember the return values and params of all array functions.

CakePHP member

jose caught me doing the same thing :)

A mistake we all made once or twice!

fitorec and others added some commits
@fitorec fitorec Fix unreachable code in Model mergeVars
Squashed commit of the following:

commit c832646
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 18:04:11 2011 -0600

    add a space after the comma in the $merge array

commit 22ad6cd
Author: Fitorec <chanerec@gmail.com>
Date:   Tue Dec 6 03:31:54 2011 -0600

    removing the condition and adding actsAs to the default list of merged keys.

commit afa4dd0
Author: Fitorec <chanerec@gmail.com>
Date:   Mon Dec 5 12:10:32 2011 -0600

    Solving the small defect in the array of behaviors(actsAs)

Signed-off-by: mark_story <mark@mark-story.com>
e7c913a
@shama shama Correct placement of between on FormHelper radio and input
Fixes #1992
c93dab6
@shama shama Remove extra space in HtmlHelper radio tag c34bf67
@markstory markstory Merge pull request #381 from shama/2.1
Correct placement of between on FormHelper radio and input
28140f9
@markstory markstory Merge pull request #382 from shama/patch-radio-space
Remove extra space in HtmlHelper radio tag
ab2cf59
@markstory markstory Add File::mime()
Fixes #1051
f959fce
@markstory markstory Fix failing tests.
You can't use finfo on files that don't exist.
2d68e7d
@shama shama Ability to set hiddenField value with FormHelper::checkbox
Fixes #1811
5225fe2
@lorenzo lorenzo Merge pull request #383 from shama/patch-checkbox-hiddenField
Ability to set hiddenField value with FormHelper::checkbox
99e9f62
@markstory markstory Fix issue with link generation and no title.
Fix urlencoded text from being displayed in text of links.

Fixes #2387
866177f
@markstory markstory Datetime labels should point at the first input.
Label elements generated for datetime/date/time inputs should point
at the first generated input. Apply + update patch from MrRio.

Fixes #427
c13e658
@markstory markstory Update doc blocks. c272a8b
@markstory markstory Make App test cases the default.
Fixes #2372
c8fd7c0
@dereuromark dereuromark Indentation fix (tab instead of spaces)
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
a41539d
@ADmad ADmad Fixed files inside dot folder showing up even when hiding dot files/f…
…older in Folder::tree(). Closes #2395
7339640
@ADmad ADmad Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
3890727
@ADmad ADmad Removing unused function Folder::_tree(). Added exception handling in…
… Folder::delete().
b84c9a1
@ADmad ADmad Made default value and behavior of param `$exceptions` for Folder::tr…
…ee() identical to same param in Folder::read()
bcab3d0
@ADmad ADmad Fixing failing test case. e077cf8
@ADmad ADmad Added multi-model fieldList support ba27c8c
Dien Vu Edit link for memcache : f859d53
@markstory
CakePHP member

Could you point this pull request at either the 1.3 or 2.0 branches? We don't merge pull requests into master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.