Skip to content

Commit 648cdc6

Browse files
othercoreyothercorey
committed
Merge branch '4.x' into 4.next
2 parents 5f55c0d + 7006678 commit 648cdc6

File tree

123 files changed

+767
-1660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+767
-1660
lines changed

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
3+
CakePHP(tm) : The Rapid Development PHP Framework (https://cakephp.org)
44
Copyright (c) 2005-present, Cake Software Foundation, Inc.
55

66
Permission is hereby granted, free of charge, to any person obtaining a

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"support": {
2020
"issues": "https://github.com/cakephp/debug_kit/issues",
21-
"forum": "http://stackoverflow.com/tags/cakephp",
21+
"forum": "https://stackoverflow.com/tags/cakephp",
2222
"irc": "irc://irc.freenode.org/cakephp",
2323
"source": "https://github.com/cakephp/debug_kit"
2424
},

‎config/bootstrap.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
declare(strict_types=1);
33

44
/**
5-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
66
*
77
* Licensed under The MIT License
88
* For full copyright and license information, please see the LICENSE.txt
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
13-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
13+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1414
*/
1515
use Cake\Database\Query;
1616
use Cake\Datasource\ConnectionManager;

‎src/Cache/Engine/DebugEngine.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
13-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
13+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1414
*/
1515
namespace DebugKit\Cache\Engine;
1616

‎src/Command/BenchmarkCommand.php‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
1313
* @since DebugKit 1.0
14-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
14+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1515
*/
1616
namespace DebugKit\Command;
1717

@@ -54,7 +54,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
5454
$options = array_merge($defaults, $args->getOptions());
5555
$times = [];
5656

57-
$io->out(Text::insert(__d('debug_kit', '-> Testing :url'), compact('url')));
57+
$io->out(Text::insert('-> Testing :url', compact('url')));
5858
$io->out('');
5959
for ($i = 0; $i < $options['n']; $i++) {
6060
/** @psalm-suppress PossiblyInvalidOperand */
@@ -84,25 +84,25 @@ protected function _results($times)
8484
$duration = array_sum($times);
8585
$requests = count($times);
8686

87-
$this->io->out(Text::insert(__d('debug_kit', 'Total Requests made: :requests'), compact('requests')));
88-
$this->io->out(Text::insert(__d('debug_kit', 'Total Time elapsed: :duration (seconds)'), compact('duration')));
87+
$this->io->out(Text::insert('Total Requests made: :requests', compact('requests')));
88+
$this->io->out(Text::insert('Total Time elapsed: :duration (seconds)', compact('duration')));
8989

9090
$this->io->out('');
9191

92-
$this->io->out(Text::insert(__d('debug_kit', 'Requests/Second: :rps req/sec'), [
92+
$this->io->out(Text::insert('Requests/Second: :rps req/sec', [
9393
'rps' => round($requests / $duration, 3),
9494
]));
9595

96-
$this->io->out(Text::insert(__d('debug_kit', 'Average request time: :average-time seconds'), [
96+
$this->io->out(Text::insert('Average request time: :average-time seconds', [
9797
'average-time' => round($duration / $requests, 3),
9898
]));
9999

100-
$this->io->out(Text::insert(__d('debug_kit', 'Standard deviation of average request time: :std-dev'), [
100+
$this->io->out(Text::insert('Standard deviation of average request time: :std-dev', [
101101
'std-dev' => round($this->_deviation($times, true), 3),
102102
]));
103103

104104
if (!empty($times)) {
105-
$this->io->out(Text::insert(__d('debug_kit', 'Longest/shortest request: :longest sec/:shortest sec'), [
105+
$this->io->out(Text::insert('Longest/shortest request: :longest sec/:shortest sec', [
106106
'longest' => round(max($times), 3),
107107
'shortest' => round(min($times), 3),
108108
]));
@@ -161,32 +161,28 @@ protected function _deviation($times, $sample = true)
161161
*/
162162
protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionParser
163163
{
164-
$parser->setDescription(__d(
165-
'debug_kit',
164+
$parser->setDescription(
166165
'Allows you to obtain some rough benchmarking statistics' .
167166
'about a fully qualified URL.'
168-
))
167+
)
169168
->addArgument('url', [
170-
'help' => __d('debug_kit', 'The URL to request.'),
169+
'help' => 'The URL to request.',
171170
'required' => true,
172171
])
173172
->addOption('n', [
174173
'default' => 10,
175-
'help' => __d('debug_kit', 'Number of iterations to perform.'),
174+
'help' => 'Number of iterations to perform.',
176175
])
177176
->addOption('t', [
178177
'default' => 100,
179-
'help' => __d(
180-
'debug_kit',
181-
'Maximum total time for all iterations, in seconds.' .
182-
'If a single iteration takes more than the timeout, only one request will be made'
183-
),
178+
'help' =>
179+
'Maximum total time for all iterations, in seconds. ' .
180+
'If a single iteration takes more than the timeout, only one request will be made',
184181
])
185-
->setEpilog(__d(
186-
'debug_kit',
182+
->setEpilog(
187183
'Example Use: `cake benchmark --n 10 --t 100 http://localhost/testsite`. ' .
188184
'<info>Note:</info> this benchmark does not include browser render times.'
189-
));
185+
);
190186

191187
return $parser;
192188
}

‎src/Controller/ComposerController.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
1313
* @since DebugKit 3.6.1
14-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
14+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1515
*/
1616
namespace DebugKit\Controller;
1717

@@ -56,7 +56,7 @@ public function checkDependencies()
5656
$packages = [];
5757
foreach ($dependencies as $dependency) {
5858
if (strpos($dependency, 'php_network_getaddresses') !== false) {
59-
throw new \RuntimeException(__d('debug_kit', 'You have to be connected to the internet'));
59+
throw new \RuntimeException('You have to be connected to the internet');
6060
}
6161
if (strpos($dependency, '<highlight>') !== false) {
6262
$packages['semverCompatible'][] = $dependency;

‎src/Controller/DashboardController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
13-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
13+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1414
*/
1515
namespace DebugKit\Controller;
1616

‎src/Controller/DebugKitController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
13-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
13+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1414
*/
1515
namespace DebugKit\Controller;
1616

‎src/Controller/MailPreviewController.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
1313
* @since 3.3
14-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
14+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1515
*/
1616
namespace DebugKit\Controller;
1717

@@ -71,7 +71,7 @@ public function sent($panelId, $number)
7171
// @codingStandardsIgnoreEnd
7272

7373
if (empty($content['emails'][$number])) {
74-
throw new NotFoundException(__d('debug_kit', 'No emails found in this request'));
74+
throw new NotFoundException('No emails found in this request');
7575
}
7676

7777
$email = $content['emails'][$number];
@@ -151,7 +151,7 @@ protected function respondWithPart($email, $partType)
151151
$part = $this->findPart($email, $partType);
152152

153153
if ($part === null) {
154-
throw new NotFoundException(__d('debug_kit', "Email part ''{0}'' not found in email", $partType));
154+
throw new NotFoundException(sprintf("Email part '%s' not found in email", $partType));
155155
}
156156

157157
$response = $this->response->withType($partType);
@@ -273,9 +273,8 @@ protected function findPreview($previewName, $emailName, $plugin = '')
273273

274274
$email = $mailPreview->find($emailName);
275275
if (!$email) {
276-
throw new NotFoundException(__d(
277-
'debug_kit',
278-
'Mailer preview {0}::{1} not found',
276+
throw new NotFoundException(sprintf(
277+
'Mailer preview %s::%s not found',
279278
$previewName,
280279
$emailName
281280
));

‎src/Controller/PanelsController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
declare(strict_types=1);
33

44
/**
5-
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
6-
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
5+
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
6+
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
77
*
88
* Licensed under The MIT License
99
* Redistributions of files must retain the above copyright notice.
1010
*
11-
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
12-
* @link http://cakephp.org CakePHP(tm) Project
13-
* @license http://www.opensource.org/licenses/mit-license.php MIT License
11+
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
12+
* @link https://cakephp.org CakePHP(tm) Project
13+
* @license https://www.opensource.org/licenses/mit-license.php MIT License
1414
*/
1515
namespace DebugKit\Controller;
1616

0 commit comments

Comments
 (0)