Skip to content

Commit 8e1db37

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.4
2 parents c0029f9 + df2adca commit 8e1db37

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

tests/system/Database/Migrations/MigrationRunnerTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
use Config\Services;
2424
use org\bovigo\vfs\vfsStream;
2525
use org\bovigo\vfs\vfsStreamDirectory;
26+
use Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration;
27+
use Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration;
2628

2729
/**
2830
* @group DatabaseLive
@@ -258,7 +260,7 @@ public function testFindMigrationsSuccessTimestamp(): void
258260
'version' => '2018-01-24-102301',
259261
'name' => 'Some_migration',
260262
'path' => realpath(TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php'),
261-
'class' => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration',
263+
'class' => Migration_some_migration::class,
262264
'namespace' => 'Tests\Support\MigrationTestMigrations',
263265
];
264266
$mig1->uid = $runner->getObjectUid($mig1);
@@ -267,7 +269,7 @@ public function testFindMigrationsSuccessTimestamp(): void
267269
'version' => '2018-01-24-102302',
268270
'name' => 'Another_migration',
269271
'path' => realpath(TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php'),
270-
'class' => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
272+
'class' => Migration_another_migration::class,
271273
'namespace' => 'Tests\Support\MigrationTestMigrations',
272274
'uid' => '20180124102302Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
273275
];

user_guide_src/source/outgoing/view_parser.rst

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -426,20 +426,11 @@ Custom Filters
426426
--------------
427427

428428
You can easily create your own filters by editing **app/Config/View.php** and adding new entries to the
429-
``$filters`` array. Each key is the name of the filter is called by in the view, and its value is any valid PHP
429+
``$filters`` array. Each key is the name which the filter is called by in the view, and its value is any valid PHP
430430
callable:
431431

432432
.. literalinclude:: view_parser/012.php
433433

434-
PHP Native functions as Filters
435-
-------------------------------
436-
437-
You can use native php function as filters by editing **app/Config/View.php** and adding new entries to the
438-
``$filters`` array.Each key is the name of the native PHP function is called by in the view, and its value is any valid native PHP
439-
function prefixed with:
440-
441-
.. literalinclude:: view_parser/013.php
442-
443434
Parser Plugins
444435
==============
445436

user_guide_src/source/outgoing/view_parser/012.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
class View extends BaseView
88
{
99
public $filters = [
10-
'abs' => '\CodeIgniter\View\Filters::abs',
11-
'capitalize' => '\CodeIgniter\View\Filters::capitalize',
10+
'foo' => '\Some\Class::methodName',
11+
'str_repeat' => 'str_repeat', // native php function
1212
];
1313

1414
// ...
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
22

3-
return $parser->render('myview');
3+
return $parser->renderString('<ul><li>Item 1</li><li>Item 2</li></ul>');

0 commit comments

Comments
 (0)