Skip to content

Loading…

Skel sync+copyright 2013 #1121

Closed
wants to merge 1 commit into from

6 participants

@ravage84
CakePHP member

synced skel & app folder, updated copyright to 2013 everywhere (checked with regex), updated gitignore

@lorenzo
CakePHP member

Why do you have so many commits in this pull requests from other developers?

@rchavik
CakePHP member

he's wondering the same thing in #cakephp :)

@markstory markstory commented on an outdated diff
app/View/Emails/html/default.ctp
((6 lines not shown))
echo '<p> ' . $line . "</p>\n";
-endforeach;
+}
@markstory CakePHP member

We usually use keyword versions of control structures in .ctp files.

@ravage84 CakePHP member
ravage84 added a note

OK, no prob. Didn't know. I was checking the docs http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html and found nothing there...
Probably this should be added to the docs.

Shall I open a ticket for the docs about that?
I could go forward and add it to the docs but I think someone with a broader view of the standards should go forward and add everything about view files in...

@markstory CakePHP member

I can update the docs around view files. There is really only one big difference, and that is using keyword flavours of control structures.

@ravage84 CakePHP member
ravage84 added a note

Great taht would people like me keep from changing that stuff ;-)
Going to revert these changes.

@markstory CakePHP member

I updated the docs in cakephp/docs@fcc7b77

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
app/webroot/index.php
((6 lines not shown))
* cannot modify your include_path set this value.
*
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * \lib\Cake\Console\Templates\skel\webroot\index.php
@markstory CakePHP member

Most path examples use / path separators.

@ravage84 CakePHP member
ravage84 added a note

Sorry... I'm developing on Windows. But I can fix that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
app/webroot/test.php
((6 lines not shown))
* need to cannot modify your include_path, you can set this path.
*
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * \lib\Cake\Console\Templates\skel\webroot\test.php
@markstory CakePHP member

Wrong slashes here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
@@ -29,8 +27,8 @@
*
* cake schema run create i18n
*/
-class i18nSchema extends CakeSchema {
-
+// @codingStandardsIgnoreStart
@markstory CakePHP member

I don't think this ignore is needed with the class being renamed.

@ravage84 CakePHP member
ravage84 added a note

I wasn't sure about it but wanted to play safe...
I'll take it out

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
lib/Cake/Console/Templates/skel/Config/acl.php
((14 lines not shown))
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
+=======
+ * @copyright Copyright 2005-2013, Cake Software Foundation, Inc. (http://cakefoundation.org)
+>>>>>>> Added previously unversioned file which was created during sync of \app\ and \lib\Cake\Console\Templates\skel\
@markstory CakePHP member

Conflict markers got left behind.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
lib/Cake/Console/Templates/skel/Console/cake.php
@@ -22,10 +22,13 @@
if (function_exists('ini_set')) {
$root = dirname(dirname(dirname(__FILE__)));
+
+ // the following line differs from its sibling
+ // \app\Console\cake.php
@markstory CakePHP member

Wrong slash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on the diff
...Console/Templates/skel/Controller/PagesController.php
@@ -49,7 +57,7 @@ public function display() {
if (!$count) {
$this->redirect('/');
}
- $page = $subpage = $title = null;
+ $page = $subpage = $title_for_layout = null;
@markstory CakePHP member

This variable name will cause code style errors. But its also in the app dir. I can fix both afterwards.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
...e/Console/Templates/skel/View/Emails/html/default.ctp
@@ -19,7 +19,7 @@
<?php
$content = explode("\n", $content);
-foreach ($content as $line):
- echo '<p> ' . $line . '</p>';
-endforeach;
+foreach ($content as $line) {
+ echo '<p> ' . $line . "</p>\n";
+}
@markstory CakePHP member

We try to stick with keyword controls structures in ctp files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
lib/Cake/Console/Templates/skel/webroot/index.php
@@ -57,6 +57,9 @@
* cannot modify your include_path set this value.
*
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * \app\webroot\index.php
@markstory CakePHP member

Wrong slash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@markstory markstory commented on an outdated diff
lib/Cake/Console/Templates/skel/webroot/test.php
@@ -54,6 +54,9 @@
* need to cannot modify your include_path, you can set this path.
*
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * \app\webroot\test.php
@markstory CakePHP member

Wrong slash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@ravage84 ravage84 app\ \skel\ sync, copyright update, gitignore
Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync

Fixed various @package annotations in \app\

Re-renamed .gitignore

Fixed various @package annotations in \lib\Cake\Console\Templates\skel\

Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)

Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore

Brought previously forgotten/not committed files in sync (again)

Updated all copyrights to 2013 (I think I found all, even some outdated)

Added previously unversioned file which was created during sync of \app\ and \lib\Cake\Console\Templates\skel\

Fixed cakephp#1121 (comment)

Fixed cakephp#1121 (comment)

Fixed cakephp#1121 (comment)

Fixed cakephp#1121 (comment)

Missing punctuation

Fixed cakephp#1121 (comment)

Fixed cakephp#1121 (comment)

Fixed cakephp#1121 (comment)

Fixed cakephp#1121 (comment)
02046fa
@predominant
CakePHP member

Nope.

Copyright will be removed from all files, and listed in a single place in the license file.

Every year, this copyright change fucks us over with merge conflicts, so we'll be making that easier by consolidating.

Closing.

@predominant predominant closed this
@ravage84 ravage84 referenced this pull request
Commit has since been removed from the repository and is no longer available.
@markstory
CakePHP member

@predominant RLY? That would be awwweessome!

@ravage84 ravage84 deleted the ravage84:skel-sync+copyright-2013 branch
@ceeram
CakePHP member

@markstory are you sure? more awesomeness: 7b860de

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 7, 2013
  1. @ravage84

    app\ \skel\ sync, copyright update, gitignore

    ravage84 committed
    Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
    
    Fixed various @package annotations in \app\
    
    Re-renamed .gitignore
    
    Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
    
    Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)
    
    Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
    
    Brought previously forgotten/not committed files in sync (again)
    
    Updated all copyrights to 2013 (I think I found all, even some outdated)
    
    Added previously unversioned file which was created during sync of \app\ and \lib\Cake\Console\Templates\skel\
    
    Fixed cakephp#1121 (comment)
    
    Fixed cakephp#1121 (comment)
    
    Fixed cakephp#1121 (comment)
    
    Fixed cakephp#1121 (comment)
    
    Missing punctuation
    
    Fixed cakephp#1121 (comment)
    
    Fixed cakephp#1121 (comment)
    
    Fixed cakephp#1121 (comment)
    
    Fixed cakephp#1121 (comment)
Something went wrong with that request. Please try again.