@@ -255,7 +255,12 @@ private function refreshClasses(): void
255255
256256 foreach ($ foundClasses as $ class ) {
257257 if (isset ($ this ->classes [$ class ])) {
258- throw new Nette \InvalidStateException ("Ambiguous class $ class resolution; defined in {$ this ->classes [$ class ][0 ]} and in $ file. " );
258+ throw new Nette \InvalidStateException (sprintf (
259+ 'Ambiguous class %s resolution; defined in %s and in %s. ' ,
260+ $ class ,
261+ $ this ->classes [$ class ][0 ],
262+ $ file
263+ ));
259264 }
260265
261266 $ this ->classes [$ class ] = [$ file , $ mtime ];
@@ -273,7 +278,7 @@ private function refreshClasses(): void
273278 private function createFileIterator (string $ dir ): Nette \Utils \Finder
274279 {
275280 if (!is_dir ($ dir )) {
276- throw new Nette \IOException ("File or directory ' $ dir ' not found. " );
281+ throw new Nette \IOException (sprintf ( "File or directory '%s ' not found. " , $ dir ) );
277282 }
278283
279284 $ dir = realpath ($ dir ) ?: $ dir ; // realpath does not work in phar
@@ -344,7 +349,12 @@ private function updateFile(string $file): void
344349 }
345350
346351 if (isset ($ prevFile )) {
347- throw new Nette \InvalidStateException ("Ambiguous class $ class resolution; defined in $ prevFile and in $ file. " );
352+ throw new Nette \InvalidStateException (sprintf (
353+ 'Ambiguous class %s resolution; defined in %s and in %s. ' ,
354+ $ class ,
355+ $ prevFile ,
356+ $ file
357+ ));
348358 }
349359
350360 $ this ->classes [$ class ] = [$ file , filemtime ($ file )];
@@ -521,7 +531,7 @@ private function saveCache($lock = null): void
521531
522532 if (file_put_contents ("$ file.tmp " , $ code ) !== strlen ($ code ) || !rename ("$ file.tmp " , $ file )) {
523533 @unlink ("$ file.tmp " ); // @ file may not exist
524- throw new \RuntimeException ("Unable to create ' $ file '. " );
534+ throw new \RuntimeException (sprintf ( "Unable to create '%s '. " , $ file ) );
525535 }
526536
527537 if (function_exists ('opcache_invalidate ' )) {
@@ -535,9 +545,14 @@ private function acquireLock(string $file, int $mode)
535545 {
536546 $ handle = @fopen ($ file , 'w ' ); // @ is escalated to exception
537547 if (!$ handle ) {
538- throw new \RuntimeException ("Unable to create file ' $ file '. " . error_get_last ()['message ' ]);
548+ throw new \RuntimeException (sprintf ( "Unable to create file '%s '. %s " , $ file , error_get_last ()['message ' ]) );
539549 } elseif (!@flock ($ handle , $ mode )) { // @ is escalated to exception
540- throw new \RuntimeException ('Unable to acquire ' . ($ mode & LOCK_EX ? 'exclusive ' : 'shared ' ) . " lock on file ' $ file'. " . error_get_last ()['message ' ]);
550+ throw new \RuntimeException (sprintf (
551+ "Unable to acquire %s lock on file '%s'. %s " ,
552+ $ mode & LOCK_EX ? 'exclusive ' : 'shared ' ,
553+ $ file ,
554+ error_get_last ()['message ' ]
555+ ));
541556 }
542557
543558 return $ handle ;
0 commit comments