Skip to content

Commit 75b5931

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.5
Conflicts: user_guide_src/source/installation/installing_composer.rst
2 parents 5c1bf31 + 206d1ae commit 75b5931

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

user_guide_src/source/installation/installing_composer.rst

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@ Composer Installation
55
:local:
66
:depth: 2
77

8-
Composer can be used in several ways to install CodeIgniter4 on your system.
8+
Composer can be used in two ways to install CodeIgniter4 on your system.
99

1010
.. important:: CodeIgniter4 requires Composer 2.0.14 or later.
1111

1212
.. note:: If you are not familiar with Composer, we recommend you read
1313
`Basic usage <https://getcomposer.org/doc/01-basic-usage.md>`_ first.
1414

15-
The first technique describes creating a skeleton project
15+
The first technique describes creating a skeleton project (app starter)
1616
using CodeIgniter4, that you would then use as the base for a new webapp.
1717
The second technique described below lets you add CodeIgniter4 to an existing
1818
webapp,
1919

2020
.. note:: If you are using a Git repository to store your code, or for
21-
collaboration with others, then the **vendor** folder would normally
22-
be "git ignored". In such a case, you will need to do a ``composer update``
23-
when you clone the repository to a new system.
21+
collaboration with others, then the **vendor** folder would normally
22+
be "git ignored". In such a case, you will need to do a ``composer install``
23+
(or ``composer update`` if you want to update all Composer dependencies) when
24+
you clone the repository to a new system.
2425

2526
App Starter
2627
===========
@@ -182,9 +183,9 @@ In your project root:
182183
.. important:: When you deploy to your production server, don't forget to run the
183184
following command:
184185

185-
.. code-block:: console
186+
.. code-block:: console
186187
187-
composer install --no-dev
188+
composer install --no-dev
188189
189190
The above command will remove the Composer packages only for development
190191
that are not needed in the production environment. This will greatly reduce

user_guide_src/source/libraries/uploaded_files/002.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function upload()
2727
],
2828
],
2929
];
30-
if (! $this->validate($validationRule)) {
30+
if (! $this->validateData([], $validationRule)) {
3131
$data = ['errors' => $this->validator->getErrors()];
3232

3333
return view('upload_form', $data);

0 commit comments

Comments
 (0)