From 337c2f0a7c8668be95b285c214e4f730232e750b Mon Sep 17 00:00:00 2001 From: Malachi Soord Date: Mon, 7 Jan 2013 21:28:09 +0000 Subject: [PATCH 1/7] Fixed issue with html unit tests --- laravel/tests/cases/html.test.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/laravel/tests/cases/html.test.php b/laravel/tests/cases/html.test.php index 3af4efde..150fbd5a 100644 --- a/laravel/tests/cases/html.test.php +++ b/laravel/tests/cases/html.test.php @@ -36,9 +36,9 @@ class HtmlTest extends PHPUnit_Framework_TestCase { $html2 = HTML::script('http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js'); $html3 = HTML::script('foo.js', array('type' => 'text/javascript')); - $this->assertEquals(''."\n", $html1); - $this->assertEquals(''."\n", $html2); - $this->assertEquals(''."\n", $html3); + $this->assertEquals(''.PHP_EOL, $html1); + $this->assertEquals(''.PHP_EOL, $html2); + $this->assertEquals(''.PHP_EOL, $html3); } /** @@ -52,9 +52,9 @@ class HtmlTest extends PHPUnit_Framework_TestCase { $html2 = HTML::style('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js'); $html3 = HTML::style('foo.css', array('media' => 'print')); - $this->assertEquals(''."\n", $html1); - $this->assertEquals(''."\n", $html2); - $this->assertEquals(''."\n", $html3); + $this->assertEquals(''.PHP_EOL, $html1); + $this->assertEquals(''.PHP_EOL, $html2); + $this->assertEquals(''.PHP_EOL, $html3); } /** From 1e7917adea1d655dcb025dc727adf53ec1e4ff30 Mon Sep 17 00:00:00 2001 From: Pierre Bertet Date: Tue, 8 Jan 2013 16:57:18 +0100 Subject: [PATCH 2/7] Documentation: relative link to the documentation Signed-off-by: Pierre Bertet --- laravel/documentation/controllers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/controllers.md b/laravel/documentation/controllers.md index eb3e490a..7bece18b 100644 --- a/laravel/documentation/controllers.md +++ b/laravel/documentation/controllers.md @@ -140,7 +140,7 @@ Define the controller class and store it in **controllers/admin/panel.php**. ## Controller Layouts -Full documentation on using layouts with Controllers [can be found on the Templating page](http://laravel.com/docs/views/templating). +Full documentation on using layouts with Controllers [can be found on the Templating page](/docs/views/templating). ## RESTful Controllers From 63708d64e08eff388c881ff8e48bd33565ac6951 Mon Sep 17 00:00:00 2001 From: Pierre Bertet Date: Tue, 8 Jan 2013 16:57:52 +0100 Subject: [PATCH 3/7] Documentation: typo Signed-off-by: Pierre Bertet --- laravel/documentation/views/home.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/views/home.md b/laravel/documentation/views/home.md index 3daf57a9..97e9e19f 100644 --- a/laravel/documentation/views/home.md +++ b/laravel/documentation/views/home.md @@ -184,7 +184,7 @@ Now each time the "home" view is created, an instance of the View will be passed ## Redirects -It's important to note that both routes and controllers require responses to be returned with the 'return' directive. Instead of calling "Redirect::to()"" where you'd like to redirect the user. You'd instead use "return Redirect::to()". This distinction is important as it's different than most other PHP frameworks and it could be easy to accidentally overlook the importance of this practice. +It's important to note that both routes and controllers require responses to be returned with the 'return' directive. Instead of calling "Redirect::to()" where you'd like to redirect the user. You'd instead use "return Redirect::to()". This distinction is important as it's different than most other PHP frameworks and it could be easy to accidentally overlook the importance of this practice. #### Redirecting to another URI: From a1facced9a7df2b887af7daca551f7cb46e825a7 Mon Sep 17 00:00:00 2001 From: Pierre Bertet Date: Tue, 8 Jan 2013 17:10:38 +0100 Subject: [PATCH 4/7] Documentation typography: ellipses Signed-off-by: Pierre Bertet --- laravel/documentation/artisan/tasks.md | 4 ++-- laravel/documentation/bundles.md | 2 +- laravel/documentation/changes.md | 2 +- laravel/documentation/contrib/tortoisegit.md | 6 +++--- laravel/documentation/database/eloquent.md | 2 +- laravel/documentation/input.md | 2 +- laravel/documentation/models.md | 4 ++-- laravel/documentation/validation.md | 8 ++++---- laravel/documentation/views/pagination.md | 6 +++--- laravel/documentation/views/templating.md | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/laravel/documentation/artisan/tasks.md b/laravel/documentation/artisan/tasks.md index a5ab78b6..761c6414 100644 --- a/laravel/documentation/artisan/tasks.md +++ b/laravel/documentation/artisan/tasks.md @@ -23,7 +23,7 @@ To create a task create a new class in your **application/tasks** directory. The public function run($arguments) { - // Do awesome notifying... + // Do awesome notifying… } } @@ -54,7 +54,7 @@ Remember, you can call specific methods on your task, so, let's add an "urgent" public function run($arguments) { - // Do awesome notifying... + // Do awesome notifying… } public function urgent($arguments) diff --git a/laravel/documentation/bundles.md b/laravel/documentation/bundles.md index 674deb25..ae9ff72a 100644 --- a/laravel/documentation/bundles.md +++ b/laravel/documentation/bundles.md @@ -116,7 +116,7 @@ Each time a bundle is started, it fires an event. You can listen for the startin Event::listen('laravel.started: admin', function() { - // The "admin" bundle has started... + // The "admin" bundle has started… }); It is also possible to "disable" a bundle so that it will never be started. diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index 7cc76b9b..03e65647 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -315,7 +315,7 @@ Add the following code above `Blade::sharpen()` in `application/start.php`.. ## Laravel 3.1.4 - Fixes Response header casing bug. -- Fixes SQL "where in" (...) short-cut bug. +- Fixes SQL "where in" (…) short-cut bug. ### Upgrading From 3.1.3 diff --git a/laravel/documentation/contrib/tortoisegit.md b/laravel/documentation/contrib/tortoisegit.md index 74049ead..96f1d9b9 100644 --- a/laravel/documentation/contrib/tortoisegit.md +++ b/laravel/documentation/contrib/tortoisegit.md @@ -28,7 +28,7 @@ Login to GitHub and visit the [Laravel Repository](https://github.com/laravel/la Open up Windows Explorer and create a new directory where you can make development changes to Laravel. -- Right-click the Laravel directory to bring up the context menu. Click on **Git Clone...** +- Right-click the Laravel directory to bring up the context menu. Click on **Git Clone…** - Git clone - **Url:** https://github.com/laravel/laravel.git - **Directory:** the directory that you just created in the previous step @@ -73,7 +73,7 @@ Now that you have created your own branch and have switched to it, it's time to Now that you have finished coding and testing your changes, it's time to commit them to your local repository: -- Right-click the Laravel directory and goto **Git Commit -> "feature/localization-docs"...** +- Right-click the Laravel directory and goto **Git Commit -> "feature/localization-docs"…** - Commit - **Message:** Provide a brief explaination of what you added or changed - Click **Sign** - This tells the Laravel team know that you personally agree to your code being added to the Laravel core @@ -85,7 +85,7 @@ Now that you have finished coding and testing your changes, it's time to commit Now that your local repository has your committed changes, it's time to push (or sync) your new branch to your fork that is hosted in GitHub: -- Right-click the Laravel directory and goto **Git Sync...** +- Right-click the Laravel directory and goto **Git Sync…** - Git Syncronization - **Local Branch:** feature/localization-docs - **Remote Branch:** leave this blank diff --git a/laravel/documentation/database/eloquent.md b/laravel/documentation/database/eloquent.md index b2178635..d38ed380 100644 --- a/laravel/documentation/database/eloquent.md +++ b/laravel/documentation/database/eloquent.md @@ -425,7 +425,7 @@ In this example, **only two queries will be executed**! SELECT * FROM "books" - SELECT * FROM "authors" WHERE "id" IN (1, 2, 3, 4, 5, ...) + SELECT * FROM "authors" WHERE "id" IN (1, 2, 3, 4, 5, …) Obviously, wise use of eager loading can dramatically increase the performance of your application. In the example above, eager loading cut the execution time in half. diff --git a/laravel/documentation/input.md b/laravel/documentation/input.md index f1429ac3..a4002c41 100644 --- a/laravel/documentation/input.md +++ b/laravel/documentation/input.md @@ -41,7 +41,7 @@ By default, *null* will be returned if the input item does not exist. However, y #### Determining if the input contains a given item: - if (Input::has('name')) ... + if (Input::has('name')) … > **Note:** The "has" method will return *false* if the input item is an empty string. diff --git a/laravel/documentation/models.md b/laravel/documentation/models.md index a1f4620c..3218dc2c 100644 --- a/laravel/documentation/models.md +++ b/laravel/documentation/models.md @@ -85,7 +85,7 @@ Services contain the *processes* of your application. So, let's keep using our T public static function validate(Location $location) { - // Validate the location instance... + // Validate the location instance… } } @@ -104,7 +104,7 @@ Repositories are the data access layer of your application. They are responsible public function save(Location $location, $user_id) { - // Store the location for the given user ID... + // Store the location for the given user ID… } } diff --git a/laravel/documentation/validation.md b/laravel/documentation/validation.md index 06feb707..aad4150e 100644 --- a/laravel/documentation/validation.md +++ b/laravel/documentation/validation.md @@ -286,7 +286,7 @@ Laravel makes working with your error messages a cinch using a simple error coll if ($validation->errors->has('email')) { - // The e-mail attribute has errors... + // The e-mail attribute has errors… } #### Retrieve the first error message for an attribute: @@ -327,7 +327,7 @@ Once you have performed your validation, you need an easy way to get the errors Route::post('register', function() { - $rules = array(...); + $rules = array(…); $validation = Validator::make(Input::all(), $rules); @@ -438,13 +438,13 @@ Or by adding an entry for your rule in the **language/en/validation.php** file: As mentioned above, you may even specify and receive a list of parameters in your custom rule: - // When building your rules array... + // When building your rules array… $rules = array( 'username' => 'required|awesome:yes', ); - // In your custom rule... + // In your custom rule… Validator::register('awesome', function($attribute, $value, $parameters) { diff --git a/laravel/documentation/views/pagination.md b/laravel/documentation/views/pagination.md index 081a6f60..867bd85b 100644 --- a/laravel/documentation/views/pagination.md +++ b/laravel/documentation/views/pagination.md @@ -38,7 +38,7 @@ You can also pass an optional array of table columns to select in the query: The links method will create an intelligent, sliding list of page links that looks something like this: - Previous 1 2 ... 24 25 26 27 28 29 30 ... 78 79 Next + Previous 1 2 … 24 25 26 27 28 29 30 … 78 79 Next The Paginator will automatically determine which page you're on and update the results and links accordingly. @@ -86,7 +86,7 @@ All pagination link elements can be style using CSS classes. Here is an example
  • 1
  • 2
    • -
  • ...
    • +
  • …
  • 11
  • 12
    • @@ -96,7 +96,7 @@ All pagination link elements can be style using CSS classes. Here is an example
  • 14
  • 15
    • -
  • ...
    • +
  • …
  • 25
  • 26
    • diff --git a/laravel/documentation/views/templating.md b/laravel/documentation/views/templating.md index 9e99e5d4..0e04430a 100644 --- a/laravel/documentation/views/templating.md +++ b/laravel/documentation/views/templating.md @@ -152,7 +152,7 @@ Similarly, you can use **@render**, which behaves the same as **@include** excep Login @endunless - // Equivalent to... + // Equivalent to… Login From f69b70aa80ad6b88957f826ebad6ec0e377905b0 Mon Sep 17 00:00:00 2001 From: Pierre Bertet Date: Thu, 10 Jan 2013 15:42:27 +0100 Subject: [PATCH 5/7] Documentation: typo Signed-off-by: Pierre Bertet --- laravel/documentation/artisan/tasks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/artisan/tasks.md b/laravel/documentation/artisan/tasks.md index 761c6414..63c9dc17 100644 --- a/laravel/documentation/artisan/tasks.md +++ b/laravel/documentation/artisan/tasks.md @@ -10,7 +10,7 @@ ## The Basics -Laravel's command-line tool is called Artisan. Artisan can be used to run "tasks" such as migrations, cronjobs, unit-tests, or anything that want. +Laravel's command-line tool is called Artisan. Artisan can be used to run "tasks" such as migrations, cronjobs, unit-tests, or anything that you want. ## Creating & Running Tasks From 347f1b8d97466bed1e7ecf63c5a753c94e06fba3 Mon Sep 17 00:00:00 2001 From: Pierre Bertet Date: Thu, 10 Jan 2013 15:46:50 +0100 Subject: [PATCH 6/7] Documentation: typo Signed-off-by: Pierre Bertet --- laravel/documentation/artisan/tasks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/documentation/artisan/tasks.md b/laravel/documentation/artisan/tasks.md index 63c9dc17..4f2fb7de 100644 --- a/laravel/documentation/artisan/tasks.md +++ b/laravel/documentation/artisan/tasks.md @@ -42,7 +42,7 @@ Now you can call the "run" method of your task via the command-line. You can eve Command::run(array('notify')); -#### Calling a task from your application with arguements: +#### Calling a task from your application with arguments: Command::run(array('notify', 'taylor')); From 4a47bda118088b12c870d55d5bae812d6e2954f3 Mon Sep 17 00:00:00 2001 From: Pierre Bertet Date: Thu, 10 Jan 2013 15:53:50 +0100 Subject: [PATCH 7/7] Documentation: markdown syntax Signed-off-by: Pierre Bertet --- laravel/documentation/contrib/command-line.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/documentation/contrib/command-line.md b/laravel/documentation/contrib/command-line.md index 5dea4cb6..0602c2e2 100644 --- a/laravel/documentation/contrib/command-line.md +++ b/laravel/documentation/contrib/command-line.md @@ -88,8 +88,8 @@ Next, commit the changes to the repository: # git commit -s -m "I added some more stuff to the Localization documentation." -"- **-s** means that you are signing-off on your commit with your name. This tells the Laravel team know that you personally agree to your code being added to the Laravel core. -"- **-m** is the message that goes with your commit. Provide a brief explanation of what you added or changed. +- **-s** means that you are signing-off on your commit with your name. This tells the Laravel team know that you personally agree to your code being added to the Laravel core. +- **-m** is the message that goes with your commit. Provide a brief explanation of what you added or changed. ## Pushing to your Fork