CS: convert CRLF to LF #12381
CS: convert CRLF to LF #12381
Conversation
joomla-cms-bot
added
Language Change
|
@piotr-cz can you tak a look inti the merge conflicts? |
|
resolved |
|
Shouldnt the language files be fixed at the source and not here. Otherwise the changes will probably be undone when they are next updated |
|
Yes, should be fixed at the source. There are links to translation teams on community page. I've tried to contact contributors to |
|
@piotr-cz Note: ini files saved with CRLF do work fine but it is good indeed to normalise. |
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->transport = $this->getMock('JHttpTransportStream', array('request'), array($this->options), 'CustomTransport', false); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
| protected function setUp() | ||
| { | ||
| $this->options = new JRegistry; | ||
| $this->client = $this->getMock('JMediawikiHttp', array('get', 'post', 'delete', 'patch', 'put')); |
There was a problem hiding this comment.
Please use the $this->getMockBuilder() rather than $this->getMock() directly. See #12990 for examples
|
You probably can skip making the changes to use |
|
@piotr-cz can you look at the merge conflicts please |
models articles fix
model featured
…s fix some BC issue. (joomla#13387) * Use user groups instead of view level for TinyMCE builder * Preload an old parameters where it possible, for BC * cs * onDisplayLegacy for BC * space to tabs * Warning message about update * Show warning only in the backend and only twice per session * Allow to select the user group only once per the set * Too much code 👽 * Update the warning message * Update the warning message * Update tinymce.php Correcting B/C
Use JPATH_ADMINISTRATOR instead of JPATH_ROOT/administrator.
Some improvements in tests joomla#4:
|
@piotr-cz can you fix the merge conflicts please... once that is done this PR can move forward |
…mla#13426) * Update en-GB.ini * Update en-GB.lib_joomla.ini * Update en-GB.ini * Update en-GB.lib_joomla.ini
…a#13439) Automatically fixed with PHPCS2 fixers
* Container added to all batch modals * Fix overflow & com_modules
* Merge remote-tracking branch 'joomla/staging' into staging * com_fields language string update * com_fields language string update * com_fields language string update * Small text edit
* simplify language file parse * revert $php_errormsg * as suggested by michael
…la#13367) * Add the description for the source and target sections in TinyMCE builder. * Spaces to Tabs * normalise "drag and drop" * caps for label * Improve the label for an access field in the set * Update strings
…into convert-crlf # Conflicts: # installation/language/fa-IR/fa-IR.ini
|
Rebased on latest staging branch again. |
|
You still want to merge 890 commits with over 2000 file changes? Did you rewrite Joomla during holiday 😉 ? |
|
This PR also changes some stuff else than EOL |
|
This PR does more than it says in the desc. It needs to be re-done |
|
I'll prepare new one then |
33 participants
Summary of Changes
Changed EOL from CRLF (Windows) to LF (Unix/ OSX) format
Didn't change for:
libraries/phputf8/README(external library)media/editors/codemirror/lib/addons.css(false positive)media/editors/codemirror/lib/addons.js(false positive)Script I've used:
credit: http://stackoverflow.com/a/73969/1012616
Testing Instructions
none
Documentation Changes Required
none