Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Top-Lebel Plugin not include package #248

Closed
wants to merge 3,759 commits into from
@kunit

Not yet available just added top-level Plugin Dir

markstory and others added some commits
@markstory markstory Fixing duplication of classes. cake-debug was used for debug and erro…
…r messages.
f1f4afa
@markstory markstory Removing dead links from the home.ctp
Updating CSS for changes in previous commit.
1c40a37
@markstory markstory Converging on 4px for border-radius.
Updating debug() to output a tiny bit more HTML so it can be made sexy.
ca078d9
@markstory markstory Fixing issues in Firefox. e735c57
@markstory markstory Tidying up forms.
Making forms look consistent in IE9.
Minor updates.
0bb19da
@markstory markstory Removing the helpPath feature as its not documented, not tested and m…
…ost likely

entirely unused.
027dba7
@lorenzo lorenzo Removing Oracle driver, it will not make it to stable release. Revert…
… this commit to bring it back for next version
89b1e54
@lorenzo lorenzo Fixing failing test in fixture test case 01f2699
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2bca143
@lorenzo lorenzo Fixing remaining failing tests df303f9
@lorenzo lorenzo Fixing fatal errors when running postgres 783b5d4
@markstory markstory Adding an exception for when a PDO interface is not installed. cc8d44f
@lorenzo lorenzo Removing $error property from DboSource, errors in queries will throw…
… exceptions now
36470f4
@markstory markstory Fixing errors and failing tests with SQLite.
Seems that MySQL is extremely permissive with NOT NULL fields.
SQLite is more strict it seems.
2ceea79
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 49b8b24
@markstory markstory Removing trigger_warning() that causes tests to fail in Sqlite, as
it does not assign lengths for integer columns.
4172eac
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 d24c408
@markstory markstory Fixing failing tests and issues with Sqlite. 2c21fc9
@lorenzo lorenzo Making postgres tests pass f0ef0aa
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 0ca8af2
@lorenzo lorenzo Adding missing expectedException annotations 7003ede
@lorenzo lorenzo Fixing a failing postgres test fcf5837
@lorenzo lorenzo Not checking length on databases that won't return it for floats d06d5f8
@markstory markstory Fixing a few more failing tests.
Adding some parent calls to tests, removing duplicated junk.
d597186
@lorenzo lorenzo Making DboSource tests more portable 61ff8d6
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 93d6cd4
@lorenzo lorenzo More postgres tests passing again 74ba030
@lorenzo lorenzo All tests passing on postgres 8897335
@lorenzo lorenzo Fixing Mysql test case after making the DboSource throw exceptions 149deba
@markstory markstory Fixing failing test. dbf801b
@markstory markstory Fixing the one failing Multibyte test. 8c8dc6c
@markstory markstory Fixing mistake in last commit. 8630f4c
@lorenzo lorenzo Skipping tests on Sqlite that involve creating a duplicate connection…
…/ It is not possible to open multiple connections to it
12c7380
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 843f7e3
@lorenzo lorenzo Adding a new exception renderer method to show useful error for faile…
…d queries
3d0af8b
@lorenzo lorenzo Oops, removing testing code 95c25a0
@markstory markstory Removing a failing test. I think the encoding of the file has changed…
… over time,

and I don't have a typeface with lowercase Georgian text.
2218923
@markstory markstory Removing more flaky tests. 684c154
@lorenzo lorenzo Releasing 2.0.0-RC1 b2fac1b
@kamui545 kamui545 Fixed typo d675b42
@markstory markstory Merge pull request #187 from kamui545/patch-2
Fixed typo
7adcfd6
@markstory markstory Deprecating the %page% style placeholders in PaginatorHelper.
Updating scaffold and bake templates to not use deprecated placeholders.
3d44489
@markstory markstory Updating documentation with missing option. a0d531c
@markstory markstory Attempting to fix build failure in Jenkins. 39c270f
@markstory markstory Register AppHelper for autoloading
Fixes issues where people with no core helpers loaded would hit fatal
errors.
Fixes #1973
9587892
@jellehenkens jellehenkens Adding tests for HtmlHelper e6826fe
@markstory markstory Fix create() and onsubmit option.
Removing support for onSubmit variant.  Additional
choices are not necessary. Fixing onsubmit option
not correctly working.
Fixes #1977
6ab59a4
@jellehenkens jellehenkens Added tests to test ajax settings 3c8c293
@markstory markstory Merge pull request #192 from jellehenkens/2.0-html-helper-tests
Added tests for the HtmlHelper for code that was not covered
8880e0c
@markstory markstory Add fix and test for CamelBack input names.
Refs #1974
fa8bdfd
@markstory markstory Moving declaration of $fieldset
Its used in base Helper methods, so that's where the property
should live as well.
d6b978c
@markstory markstory Fix issue with HABTM fields
habtm fields were not being correctly being detected.
1743eaa
@markstory markstory Adding App::uses() call to model baking.
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
7c08c96
@markstory markstory Add App::uses to baked controllers.
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
3cb3424
@jellehenkens jellehenkens Fixing test by splitting them up, testing the expected error ignored …
…the next asserts
aa45452
@markstory markstory Refactoring test.
Removing expectError() replacing it with PHPUnit annotation.
608e5ee
@jellehenkens jellehenkens Adding missing test scenarios in the paginator helper 653163c
@jellehenkens jellehenkens Adding missing test scenarios in the rss helper 38196bd
@jellehenkens jellehenkens Improved error handling for writing the test file to disk 236200c
@ADmad ADmad Refactoring Model::invalidFields() a bit. 97a975c
@markstory markstory Merge pull request #198 from jellehenkens/2.0-rss-helper-tests
Added tests for the RssHelper for code that was not covered
0e9b3dd
@markstory markstory Updating doc blocks. 9b8c280
@markstory markstory Making test case class names match file names.
Refs #1985
d74f442
@markstory markstory Adding 'vendors' alias to App
- Vendor is the new directory name, and a legacy mapping should exist.
  This makes App::path() match App::import() and all other packages.
- Add an alias for plugins -> Plugin.  It also was missing the alias,
  that matches the new style package names.

Fixes #1972
59e3065
@markstory markstory Fixing failing test from previous commit. 8272705
@jellehenkens jellehenkens Refactoring expectError() calls to PHPUnit annotations 7ba2f90
@markstory markstory Trying to fix occasional error during FixtureTaskTest. 4fda085
@markstory markstory Splitting AclTest into multiple test case files.
Fixes #1985
42dccac
@renan renan Adding `tests` method to Upgrade shell, fixing FooTestCase to FooTest.
Also making sure the preg_match matches the right class and not move the file to other directory rather than tests.
The method `tests` need to be run before `locations` to work properly.
cd6c370
@predominant predominant Fixed incorrect ife() conversion. Thanks SkieDr. d8468c1
@predominant predominant Fix comment for ife() Upgrade. Thanks SkieDr. 9d1e3cb
@ADmad ADmad For MySQL you can now specify the socket to use using `unix_socket` k…
…ey in the config array. Closes #1994
7c87e9a
@renan renan Fixed bug in CakeSchema where it determines the field position.
- Respective tests were added.
- Schema files will now have 'after' => 'previous_field' on it.
4378bb6
@markstory markstory Splitting apart the Scaffold and ScaffoldView tests.
Fixes #1985
09e7f1d
@markstory markstory Fix entity names for associated model date fields.
Fixes #1993
85b86cb
@markstory markstory Make full page caching + Themes work.
Dispatcher now uses ThemeView for rendering cache files.
This enables nocache blocks to reference theme elements.
Fixes #1858
0e5797d
@ADmad ADmad The 'default' config for Configure class is now auto created on first…
… use if not already created.
08026e5
@ADmad ADmad Fixing doc block 670fea6
@markstory markstory Merge branch '1.3' into merger
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
6a4e755
@markstory markstory Fix issue with duplicate associations when using string form.
Fixes #2002
8d43764
@lorenzo lorenzo Making theme test more flexible so it passes after recent changes in …
…templates
a2daa39
@lorenzo lorenzo Typo in last commit. Making flexible the range for memory usage in th…
…eme view after changing internal templates
8ccf904
@lorenzo lorenzo Releasing 2.0.0-RC2 b3157cd
@petteyg petteyg Add validation guess for Postgress inet field 744558d
@lorenzo lorenzo Merge pull request #204 from petteyg/2.0-postgres_inet
2.0 - Add validation guess for Postgress inet field
69934a0
@renan renan Updating cake.generic.css to its newest version from app directory. 1b2b191
@markstory markstory Updating package names in bootstrap file. bfcfeeb
@jellehenkens jellehenkens Removing PHP4 compatibility code
Signed-off-by: mark_story <mark@mark-story.com>
957a75c
@markstory markstory Removing Mime type notice.
It causes message delivery failures on some SMTP servers.
Amazon SES suffers from this issue.
Fixing failing tests caused by additional spaces in email address
formatting.
Fixes #2005
0267a04
@markstory markstory Extracting password hashing into as separate method.
This makes is much easier for a subclass to only change how passwords
are hashed.
7cabb4e
@lorenzo lorenzo Fixing doc block in core AppController file b1f8d21
@lorenzo lorenzo Making CakePlugin::loadAll() static as its fellow class methods c45538a
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 90d8667
@markstory markstory Updating doc blocks. ceed424
@renan renan Improving the regex and moving more files around.
- Making the regex case insensitive so it can also matches capital C in class (ie. Class).
- Adding a new protected method to move view files, the directory will be camelized.
0bcb8d0
@renan
Collaborator

Maybe change the method name too?
Since this is a new class in 2.0 I don't see why not.

_readStdin => _readInput

Ah good idea. :)

Fixed in [50a0a51]

ADmad and others added some commits
@ADmad ADmad Additional inflection rules provided through Inflector::rules() now t…
…ake precedence over the core ones as expected. Fixes #2016
07f6803
@markstory markstory Fix Validation::time so it accepts spaces.
Fixes #2015
6a05cad
@markstory markstory Skip . and .. when generating trees.
Fixes #2012
1559683
@markstory markstory Revert previous commit. Trying to fix jenkins build. eccc05d
@markstory markstory Redoing fix done in 1559683
Adding more test cleanup to try and solve build issues.
36928d3
@markstory markstory Apply patch from 'Eärendil' to fix FormHelper.
Fixes Model.field.1 style fields when used with SecurityComponent.
Fixes #2011
a65a5eb
Yosuke Basuke Suzuki Bug fixed. saveAll with validation option "only" or "first" works wll.
saveAll() did set null foreign key when it just validates. I've
assigned numeric validation on the hasMany side model and validation
did fail with this behavior. I've changed this not to set foreign key
when it just validation.
eef87ee
Yosuke Basuke Suzuki Added unittest for eef87ee. d9c48b0
@ADmad ADmad Merge pull request #210 from basuke/1.3
1.3 saveAll() with validation option "only" or "first" works well with associated data.
9220837
Yosuke Basuke Suzuki Added unittest for saveAll() validation with the data no id assigned. 5612d41
@ADmad ADmad Merge pull request #211 from basuke/2.0
Added tests for saveAll() to ensure it did not set foreignkey fields to null for associated models during validation (bug existed in 1.3)
1d56afc
@j15e j15e Fix to defect model virtualfields with mysqli
Refs #2017
af36429
@lorenzo lorenzo Merge pull request #212 from j15e/1.3
Fix to defect model virtualfields with mysqli
f57f730
@markstory markstory Stripping - from default Message-ID header.
This fixes issues where certiain spamassassin rules would
flag EmailComponent messages as spam due to too many - in the messageID.
Fixes #2019
c2104a3
@ADmad

When sending mails through shell/CLI env('HTTP_HOST') will be empty, so we should probably fix that too.

Indeed, that's something we should do in 2.0 for sure. I don't really know what we could use as a default domain though.

Collaborator

I see no better option than having a property in the CakeEmail class for domain name and fallback to env('HTTP_HOST') if that property is empty. Plus throw an exception if both return empty value.

When I send email through CLI I use:
HTTP_HOST=example.com cake

markstory and others added some commits
@markstory markstory Adding block to home page for PHP version.
Fixes #2010
8272758
@markstory markstory Fix incorrect documentation. dffcf04
@markstory markstory Renaming method to better match what it does. 50a0a51
@markstory markstory Adding session renewal upon login/logout.
This helps improve session security, as it reduces the opportunity
of replaying a session id successfully.
Fixes #836
b1dad6e
@markstory markstory Making locking file caching the default.
Locking files prevents many issues with unserialize() warnings
caused by partially written files.
Fix a locking issue where files would be left locked.
Fixes #1988
79687a2
@ADmad ADmad Improving error view. Closes #2027 2a55423
@markstory markstory Updating CrudAuthorize to work like ActionsAuthorize.
Updating tests.
Fixes #1749
a5fe702
@markstory markstory Adding quoting around SET NAMES.
Fixes #2028
6008e0e
@markstory markstory Fixing failing test. 7e44836
@bar bar Update Set::extract() calls inside Helper. a4fc424
@bar bar Update Helper->tagIsInvalid() documentation. b5ddd4e
@ADmad ADmad Fixing my previous attempt in ef4826e to make Model::_findCount() beh…
…ave nicely with 'group' option. Refs #1677, #573
33030a4
@majna majna Fixing failing test for Router. Debugger test fails on windows due to…
… different directory separator.
8d6fc84
@renan renan Merge pull request #217 from majna/2.0-test-suite
Fixing failing test.
2bce614
@markstory markstory Merge pull request #215 from bar/1.3-fix-extract
Minor updates to Helper.
b3e57e0
@markstory markstory Adding error code checking around CakeException handling
SocketExceptions can have error codes outside of the HTTP values.
421a211
@markstory markstory Excluding hidden files from test directory adding.
Fixes #2031
6e22f1d
@markstory markstory Adding the _x and _y fields to the unlocked fields
for image submits.
Fixes #2032
08b974d
@ceeram ceeram find with joins option now respects prefix set in database configurat…
…ion, fixes #1517

test to prove validity of ticket #1517
6afa21c
@markstory markstory Moving 'joins' key conversion into DboSource::buildJoinStatement()
Having this in Model felt like the wrong layer for it to reside.
This also simplifies a few things internally.
Refs #1517
d489d49
@phishy phishy Fixes baking of custom views. Was not setting path correctly or
capturing content
932f07c
@lorenzo lorenzo Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 7f2a4e5
@ceeram ceeram Passing empty string in [\'error\'] behaved like false, now will beha…
…ve like any other string
9f23f65
@bar bar Form input elements can now have 'error' class appended with empty er…
…ror messages.

Allow setting empty error messages inside Model->validate. This
complements Ceeram's commit which allows overriding error messages by
empty strings from Form->input().
ae8dd1c
@majna majna Fixed doc block comments. 681207e
@lorenzo lorenzo Merge pull request #221 from majna/2.0-doc-comments
Fixed doc block comments.
aa6d6a9
@lorenzo lorenzo Bringing the SQlserver datasource up to date, fixing a doc block df2ef0e
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 6b7c752
@markstory markstory Moving basic templates to the 'base' key. 864cb70
@markstory markstory Adding additional documentation for CrudAuthorize.
Fixes #2034
9e08095
@markstory markstory Add 'trace' to the data provided to Debugger formats.
Allows custom debugger output formats to display
a stack trace.
dff4574
@lorenzo lorenzo Fixing a few failing test cases and attempting to work around php seg…
…mentation fault when running the complete test suite
7b3ceb5
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 6196e74
@lorenzo lorenzo Simplifying assertions in FixtureTask test 27ab12d
@lorenzo lorenzo Converting regular expression assertions to simple string contains, t…
…hose perform faster and consume less memory
fbdb058
@lorenzo lorenzo Converting more pattern assertions into simple string contains 8acd980
@lorenzo lorenzo Merge pull request #220 from bar/1.3-fix-input-error-complete
Form input elements can now be rendered with 'error' class appended and empty error messages.
3149486
@ceeram ceeram fixing email.php.default, from should have email as key 22029a1
@ceeram ceeram fixing duplicate emails being sent with MailTransport fixes #2022 883f579
@ADmad ADmad Fixing doc block 11f3868
@markstory markstory Fixing issue with integer columns and NULL values.
Fixes #2037
a3f25ee
@markstory markstory Re-adding DISABLE_DEFAULT_ERROR_HANDLING to Configure.
Fixes #2033
534291a
@lorenzo lorenzo Adding a few class loading related changes to make the ApiGenerator p…
…lugin happy
fff42e9
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 5a181d8
@lorenzo lorenzo Fixing some @package declarations 7055939
@markstory markstory Make DboSource::lastError() fallback to the connection.
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError().  Mocking PDO is a pain.
Fixes #2046
af4b0c9
@markstory markstory Errors should be output on stderr. f4b2e03
@markstory markstory Update expectation to account for umask()
Updating a number of simple assertEqual -> assertEquals.
Fixes #2045
115c656
@markstory markstory Fix issue where abstract or interface controllers
would be constructed by Dispatcher.
Tests added.
Fixes #2048
4810518
@markstory markstory Making test more generic so it passes on Jenkins. 0fc6d7a
@markstory markstory Removing test that causes problems in AllTests. df82aa0
@markstory markstory Fixing failing test on postgres build. d9db8c8
@lorenzo lorenzo Re-implementing Mysql::listDetailedSources() to not use prepared stat…
…ements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times.
b8aa000
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 61be5b1
@lorenzo lorenzo Fixing fixtures to make them run with postgresql a94b049
@lorenzo lorenzo Removing test ins porstgres that wasn't actually testing a thing, and…
… making another postgres test pass
5d19b6d
@markstory markstory Removing unnecessary ReflectionClass instance.
Refs #2048
ff570d9
@predominant predominant Fixed missing string append operator for baked homepage to include ba…
…nner.
f69fc93
@predominant predominant Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 02cf5d3
@markstory markstory Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
c9bd973
@markstory markstory Merge branch 'merger' into 2.0 aa8965d
@markstory markstory Fixing build failure in Postgres. 3907c2b
@markstory markstory Making the HtmlHelper a default helper for emails. adcb80b
@markstory markstory Fixing issue baking controller tests.
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
aae2b0c
@markstory markstory Fixing issue where DbConfigTask would try to rebuild
database configuration.

This could happen when using commands like `Console/cake bake controller`.
Using ConnectionManager ensures that the database config file will be loaded
if its available.
84f8054
@lorenzo lorenzo Grabbing the first available config defined in connection manager as …
…a default for baking. Fixing a couple of failing test cases
d08f916
@lorenzo lorenzo Fixing error introduced in my last commit 4110ab7
@lorenzo lorenzo Making test case less configuration independent 71c7350
@lorenzo lorenzo Making model tests less time dependent 0a2553c
@lorenzo lorenzo Releasing 2.0.0-RC3 bab131b
@markstory markstory Fixing incorrect exit codes on console exceptions.
Uncaught exceptions on the console would result in exit code 0.
This is not helpful in *nix scripting.

- Update the ConsoleErrorHandler to not inherit from the web error handler.
- Make ErrorHandler::_mapErrorCode() public as it isn't overly private.
- Make ConsoleErrorHandler methods instance methods so mocking can be done.
- Add a _stop method to correctly exit.
- Update tests.
aa7448e
@markstory markstory Fix issue where missing command would exit as success. 042e817
@Phally Phally Changed the order of the include for the custom reporter and added fi…
…le_exists() to prevent errors.
69ba196
@ceeram ceeram Merge pull request #223 from Phally/custom-reporter
Custom reporter
499b5e7
@ADmad ADmad Fixing bug where you couldn't set CakeRequest::$base to empty string …
…using config variable `App.base`
dcb704a
@markstory markstory Removing duplicate inflection.
Fixes #2058
cb1ce83
@markstory markstory Set debug=2 when bake is run.
This should help with model caches being re-used when they shouldn't.
Fixes #2063
e56a2cd
@markstory markstory Fix Controller::paginate and ordering with virtualFields.
Model::isVirtualField() does ensure that model names match the current model.
This creates false positives when doing sorting datasets when an associated
model has a field with the same name as a virtualField.
Fixes #1822. Fixes #1756.
a6e4208
@markstory markstory Moving cache disabling earlier so it takes
effect.
Refs #2063
0e47c98
@basuke basuke Bypass unnecessary foreach loop when $paths is empty to improve speed. 810e2a4
@basuke basuke Refactoring: clean up the foreach loop.
- cleaner code.
- reduce call of array_values and array_unique.
- clear intent of code.
fbf4449
@tPl0ch tPl0ch Added '/lib/Cake/Console/Templates/skel/tmp' to .gitignore file to ig…
…nore cache files of CLI.
cd7b7c9
@lorenzo lorenzo Merge branch 'refactoringAppBuild' of https://github.com/basuke/cakephp
… into basuke-refactoringAppBuild
ecb63d9
@lorenzo lorenzo Fixing a couple of problem when testing dates in ModelWriteTest 746062d
@markstory markstory Merge pull request #227 from tPl0ch/2.0-gitignore
Added '/lib/Cake/Console/Templates/skel/tmp' to .gitignore.
b91c475
@lorenzo lorenzo More fixes in checking dates in tests 16ffee0
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 0a6fae0
@lorenzo lorenzo Weakening the assertion in order to make tests pass, actual differenc…
…e are in the order of 30 bytes
fca6fef
@markstory markstory Add missing echo in MissingHelperClass error page.
Fixes #2065
d40bd24
@markstory markstory Adding old webkit gradient prefixes.
Fixes #2066
2cc9523
@markstory markstory Removing extra 0 index in request parameters.
When using requestAction with the return parameter, there
would be an extra 0 index element that would create incorrect
routes in the requestedAction.
Fixes #2067
ea11392
@markstory markstory Change how floats are formatted in MySQL.
Fixing precision issues where numbers would get truncated.
Also maintaining compatibility with scientific notation.
Fixes #2049
c143908
@markstory markstory Fix typo in doc block. c11c5c5
@markstory markstory Fix another typo. a853c0f
@lorenzo lorenzo Fixing another postgres failing test ade9e4d
@lorenzo lorenzo Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 17963e9
@markstory markstory Updating the doc block for Datasource::delete()
Fixes #2054
2fa2de4
@ADmad ADmad Updating old usage `Configure::read()` to new `Configure::read('debug…
…')`. Closes #2070
fa214e8
@markstory markstory Removing uses of db->fullTableName() when creating joins.
Refs #2074
3becdc5
@markstory markstory Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Mysql.php
055224e
@markstory markstory Fixing failing tests caused by merge with 1.3 d9e51ac
@markstory markstory Making test less specific as this float cast is different
on different installs.
924e283
@kaz29 kaz29 Fixing bug in getEncoding/setEncoding for PostgreSQL.
Fixes #2028

Signed-off-by: mark_story <mark@mark-story.com>
5eb4c5c
@lorenzo lorenzo Fixing DatabaseSession handler to correctly close the session before …
…the model object is destroyed by php.

This allows to remove an old hack in ConnectionManager
a14abd6
@lorenzo lorenzo Adding destructor in CacheSession handler to avoid a fatal error when…
… closing the session
c56797a
@tPl0ch tPl0ch Removed unnessecary call to array_merge() in Model::_deleteLinks(). F…
…ixes #2075 .
d9cd69a
@renan renan Merge pull request #233 from tPl0ch/2.0-model
Removed unnessecary call to array_merge() in Model::_deleteLinks().
a8af978
@tPl0ch tPl0ch Add support for NULL values in Set::format().
Add test case.
Fixes #2076.
5d3fdfc
@markstory markstory Update the .htaccess files to increase
compatibility with shared hosting servers.
Fixes #2010
e07256b
@markstory markstory Fix inconsistency between app and skel directory.
Fixes #2077
3f778d8
@markstory markstory Fixing undefined variable reference.
Fixes #2078
455787a
@markstory markstory Fix issues with using 0 as an option for a shell command.
Fixes #2079
bc6de18
@markstory markstory Merge branch '1.3' into 1.3-merge
Conflicts:
	cake/console/cake.php
	cake/console/libs/shell.php
	cake/tests/cases/console/libs/shell.test.php
788d38c
@majna majna Fixing doc blocks in Test suite and some visibility keywords. 8c3f64b
@lorenzo lorenzo Merge pull request #237 from majna/2.0-test-docblocks
Fixing doc blocks in Test suite and some visibility keywords.
838d4a8
@majna majna Fixed doc block comments. a5220fa
@renan renan Merge pull request #238 from majna/2.0-doc-fix
Fixed doc block comments.
c43ba3f
@markstory markstory Add a test for src and href attributes
with TextHelper::autoLinkUrls()
3b1a11e
@daVinciWanaB daVinciWanaB Fix TextHelper::autoLinkUrls() from linking iframes
iframe and img elements should not be autolinked.
Fixes #GH-208
db51c05
@markstory markstory Adding another import for helpers appended by RequestHandlerComponent.
Fixes #2084.
c4eb19a
@markstory markstory Make fixtures disable source caching.
Disabling source caching when using fixtures fixes
issues with test suites.  Testsuites could previously have
test order errors caused by differences in cached and un-cached sources listings.
Fixes #1942
b261024
@evilbloodydemon evilbloodydemon Removed unnecessary ClassRegistry::flush() from test template. 8e78308
@renan renan Fixing bug when trying to Paginate ordering by multiple keys. 49f4035
@markstory markstory Merge pull request #245 from evilbloodydemon/remove-cr-flush
Removed unnecessary ClassRegistry::flush() from test template.
648a1f7
@markstory markstory Removing ?> from AppModel and AppController plugin templates. f65d763
@markstory markstory Replacing direct construction with method calls. 3c611ee
@markstory markstory Fix issue where plugin prefixes would be included in generated view.
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
7f3c566
@markstory markstory Fix content-type detection to accomodate jQuery.
Add tests for jQuery content type strings.
Refactor tests, add in missing assertions and missing parent calls.
The new behavior is more lenient and allows for a single requested
content type to switch the view type.

Fixes #2088
4090b3e
@ceeram ceeram Fixing incorrect theme paths for plugins, tests updated. Fixes #2099 981f407
@sitedyno sitedyno Incresing sync between app and skel directories. ce4acda
@sitedyno sitedyno Incresing sync between app and skel directories. 3616262
@sitedyno sitedyno Windows newlines for .bat files. 9e9b1f0
@lorenzo lorenzo Merge pull request #247 from sitedyno/2.0-app-skel
Syncing the skel and app directories
36c9315
@tPl0ch tPl0ch Removed creation of unneeded file handle object in FileEngine::write(…
…). Added configuration option 'mask' to FileEngine::. Now able to provide a permission mask to create cache files with specific permissions.

Set '0664' as default value for the 'mask' setting in FileEngine::. Adjusted corresponding test cases.
Added new warning if the file could not be opened for writing.
0a70963
Yosuke Basuke Suzuki Refactoring App::build() so it looks more readable 0b6c93c
@gjm gjm Fix association lazy-loading when used with ContainableBehavior 4adc042
@markstory markstory Removing 'cake' domain from core.
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.

Fixes #2103
6bf6d79
@markstory markstory Fix method signatures of database drivers.
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.

Fixes #2100
6d9b709
@lorenzo lorenzo Adding symlink support to the cake console executable 36fa2e8
@predominant predominant Moved "vendors" to "Vendor" and "plugins" to "Plugin". Thanks to @kunit
… and @ichikaway for the heads up.
f81c85d
@kunit kunit Top Lebel Plugin not include package 188199f
@markstory
Owner

I think you're targeting the wrong branch with this pull request. If its for 1.3, use cakephp:1.3 as the target, if its for 2.0 use cakephp:2.0 as the target.

@ADmad
Collaborator

Please don't make pull requests against master branch. Make them against the appropriate 1.3 or 2.0 branch.

@ADmad ADmad closed this
@ADmad
Collaborator

Hmm, now we have both Plugin and plugins as well as Vendor and vendors folders at root of repo. That ain't too nice.

Collaborator

Agree with admad, there had been decided to keep root level directories lowercase

@tPl0ch

I think this has to be SYM=$(readlink "$LIB") (mind the double quotes), otherwise directories with whitespaces will be cut off.

Owner

Yeah, that was fixed in a later commit. Thanks!

@ravage84

Shouldn't that be Cake.Test.Case.View.?
All other cases have Cake.Test.Case.View defined.
I guess that is a leftover from before splitting

It really doesn't matter, the package tags aren't used for anything really.

Well, what if someone generates the API docs with something else than https://github.com/cakephp/api_generator ?
For example with ApiGen or phpDocumentator (2).
Those care about the package defs.

Collaborator

@ravage84 CakePHP itself uses ApiGen now :smile:

Just noticed that i did my remark on the wrong file... should have been lib/Cake/Test/Case/View/ScaffoldViewTest.php.

Fixed it:
#1311

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.