Skip to content

Commit 90fb1fe

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.3
Conflicts: system/Debug/Exceptions.php
2 parents f51e8ef + 6496c8c commit 90fb1fe

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

system/Debug/Exceptions.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ public function errorHandler(int $severity, string $message, ?string $file = nul
186186
private function isFakerDeprecationError(string $message, ?string $file = null, ?int $line = null)
187187
{
188188
if (
189-
strpos($file, VENDORPATH . 'fakerphp/faker/') !== false
189+
defined('VENDORPATH')
190+
&& strpos($file, VENDORPATH . 'fakerphp/faker/') !== false
190191
&& $message === 'Use of "static" in callables is deprecated'
191192
) {
192193
log_message(

user_guide_src/source/general/helpers.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ functions.
2020

2121
CodeIgniter does not load Helper Files by default, so the first step in
2222
using a Helper is to load it. Once loaded, it becomes globally available
23-
in your :doc:`controller </incoming/controllers>` and
24-
:doc:`views </outgoing/views>`.
23+
in your :doc:`controller <../incoming/controllers>` and
24+
:doc:`views <../outgoing/views>`.
2525

2626
Helpers are typically stored in your **system/Helpers**, or
2727
**app/Helpers** directory. CodeIgniter will look first in your
@@ -93,6 +93,10 @@ use the following command to load the helper for us:
9393

9494
.. literalinclude:: helpers/004.php
9595

96+
You can also use the following way:
97+
98+
.. literalinclude:: helpers/007.php
99+
96100
.. note:: The functions within files loaded this way are not truly namespaced.
97101
The namespace is simply used as a convenient way to locate the files.
98102

@@ -156,5 +160,5 @@ is as follows:
156160
Now What?
157161
=========
158162

159-
In the Table of Contents, you'll find a list of all the available :doc:`Helpers </helpers/index>`.
163+
In the Table of Contents, you'll find a list of all the available :doc:`Helpers <../helpers/index>`.
160164
Browse each one to see what they do.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
3+
helper('Example\Blog\Helpers\blog');

0 commit comments

Comments
 (0)