Added autoParagraph functionality to TextHelper #1025
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For some reason that I have not been able to figure out yet the object is returned as null. This is causing some exceptions when trying to access properties that dont exist. FatalErrorException: "Call to a member function getAssociated() on a non-object" Test still pass with the added check.
Adding a check to the object before use
You cant pass func_get_args() in PHP < 5.3
removing redundant code and shifting a few things around so there are less nested ifs and making things easier to follow. Removing some variable setting, returning function calls instead.
Cleaning up the RequestHandlerCompoent
check() for CookieComponent and Configure
Removing alias function calls
skipping the rijndael test if mcrypt_encrypt() is not available
This is an optional method in DboSource that allows datasources to resetSequence values in tables. This is useful for datasources like Postgres, and makes using fixtures much easier. Fixes #3026
Add CakeNumber::fromReadableSize() and Validation::filesize()
Added ability to set default view block content
Implement resetSequence() Fixes #3206
Remove double semicolon in generated fixtures. Fixes #3429
remove nested if's and else where possible and early return.
unify new lines at the end of the file
Simplify some model code
Fix issue where Hash::expand() sets incorrect array keys Fixes #3434
Conflicts: lib/Cake/VERSION.txt
Validation simplify Simplify internals in Model/Validation
starting refactor Form->input
and accidentally been re-added in 3e3af1f
ignore last few silencers for code sniffer
Conflicts: lib/Cake/Model/CakeSchema.php lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
Following previous autoP discussion, this is an update to the function. I haven't done 'test' in cake before, so I will not be able to create the proper test cases.
Simple line returns still need to look proper - nl2br added
|
Looks like your merge is mixed up. I think you want this to target 2.3 instead of master. |
|
I went to edit only 1 file from the 2.3 branch - Not sure how it created the rest? |
|
@TeckniX The problem is your PR is targeted to the master branch instead of 2.3. When creating a PR change the "base branch" to 2.3 |
|
Figured it out - thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There's more than my file on this pull-request, which I'm not sure I understand.
Following previous autoP discussion, this is an update to the function in the TextHelper only, and renamed as autoParagraph.
I haven't done 'tests' in cake before, so I will not be able to create the proper test cases. I apologize for my lack of knowledge on this area of CakePHP