Skip to content

Conversation

@tfrommen
Copy link
Contributor

Besides minimal changes regarding a few @param PHPDoc comments in order to use the same format, this pull request contains several improvements for the reguloar twelve chapters:

  • Add a bunch of full stops to comments and task descriptions.
  • Rephrase sentences to adapt their appearance (e.g., 'Shows all...' -> 'Show all...').
  • Add trailing newlines to all files.
  • Improve a few comments/task descriptions.
  • Don't use require_once and include as functions, they are language constructs.

Add a bunch of full stops to comments and task descriptions.
Rephrase sentences to adapt their appearance (e.g., 'Shows all...' -> 'Show all...').
Remove trailing line-feeds as only a few files did have one.
Add a bunch of full stops to comments and task descriptions.
Rephrase sentences to adapt their appearance (e.g., 'Shows all...' -> 'Show all...').
Remove trailing line-feeds as only a few files did have one.
Add a bunch of full stops to comments and task descriptions.
Replace 'unused variable' with 'unreachable statement'.
Add a bunch of full stops to comments and task descriptions.
Use the same format for all @param comments.
Remove trailing line-feeds as only a few files did have one.
Add a bunch of full stops to comments and task descriptions.
Remove trailing line-feeds as only a few files did have one.
Don't use require_once as function, it is a language construct.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these changes are incorrect; according to the docs, type should be before the name of the param; http://www.phpdoc.org/docs/latest/references/phpdoc/tags/param.html

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I aggree, and I always write @param PHPDoc comments à la type, variable name, description. However, all other comments throughout the workshop materials are in the manner stated in my commit.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps it's best to wait for @maartenba to respond.

If you intend to add the missing newlines to all files, I think it's easier to do so with some simple scripting, like sed (for an example, see: http://unix.stackexchange.com/questions/31947/how-to-add-a-newline-to-the-end-of-a-file).

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Oops, clicked the wrong "add a line note" button.. should've clicked the one below)

@maartenba
Copy link
Contributor

Good changes so far!

@tfrommen
Copy link
Contributor Author

Hi Maarten,

I was just about to change what I already discussed with @thaJeztah—newlines and the end of each file, correct order of @param PHPDoc comments. That's when I saw your comment...

What do you think about this?

@maartenba
Copy link
Contributor

Sounds like a plan, I like the idea

@tfrommen tfrommen changed the title Improvements for chapters 1 to 5 Improvements (primarily for chapters 1 to 6) Jan 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, double ..

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed that.

@thaJeztah
Copy link

Lot better, thanks!

Two remarks;

  • You (inadvertently) added there's a Thumbs.db in your changes, I'd just delete that.
  • There's something weird going on with the PNGs; I cannot get them to show. I cloned your repo locally and the PNGs seem to be broken somehow.

@tfrommen
Copy link
Contributor Author

@thaJeztah The Thumbs.db file has been there all the time. I deleted it now, though.

I did not see any binary files using PhpStorm's built-in git features. I just reverted any changes to images as well as the icon file. Thanks for that.

@tfrommen tfrommen changed the title Improvements (primarily for chapters 1 to 6) Improvements (chapters 1 to 12) Jan 24, 2015
@thaJeztah
Copy link

@tfrommen thanks; weird though, if I view the files in your latest commit, GitHub won't show the images:
https://github.com/tfrommen/phpstorm-workshop/commit/f80e755bf9c5bb46194a8d15e5aa3e14828be272#diff-787d37fecfdeb310bccbbf2bc75487f2 (It does show them individually link)

Viewing the original commit, GitHub also shows them correctly; https://github.com/tfrommen/phpstorm-workshop/commit/82a3b9c0cabb79ff0bb0173bd036cd43191b31f4#diff-787d37fecfdeb310bccbbf2bc75487f2

So, not really sure what's wrong there.. weird

@maartenba
Copy link
Contributor

Looks good to me, shall I merge it in?

@thaJeztah
Copy link

@maartenba it looks good, but if you could check the PNGs just to be sure nothing's wrong with them (to confirm it's just a GitHub quirk).

maartenba added a commit that referenced this pull request Jan 25, 2015
Super awesome contribution. Thanks both!
@maartenba maartenba merged commit 07679b7 into JetBrains:master Jan 25, 2015
@thaJeztah
Copy link

Thanks @tfrommen and bedankt, Maarten :)

@maartenba
Copy link
Contributor

Thanks to both of you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants