Merge branch '3.1' into 3.2

* 3.1: Fix merge [DI] Dont share service when no id provided Fix Container and PhpDumper test inaccuracies [DI] Fix missing new line after private alias [ClassLoader] Throw an exception if the cache is not writeable Fixing regression in TwigEngine exception handling.
Merge branch '2.8' into 3.1
2026-04-26 10:18:12 +02:00 · 2017-01-10 15:14:38 +01:00 · 2017-01-10 15:09:41 +01:00 · 2017-01-10 15:03:07 +01:00 · 2017-01-09 15:44:50 +01:00 · 2017-01-02 12:32:22 -08:00
2 changed files with 14 additions and 8 deletions
@@ -60,7 +60,7 @@ class ClassCollectionLoader
            throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
        }
        $cacheDir = rtrim(realpath($cacheDir) ?: $cacheDir, '/'.DIRECTORY_SEPARATOR);
-        $cache = $cacheDir.DIRECTORY_SEPARATOR.$name.$extension;
+        $cache = $cacheDir.'/'.$name.$extension;

        // auto-reload
        $reload = false;
@@ -140,7 +140,7 @@ class ClassCollectionLoader
 REGEX;
        $dontInlineRegex = str_replace('.', $spacesRegex, $dontInlineRegex);

-        $cacheDir = explode(DIRECTORY_SEPARATOR, $cacheDir);
+        $cacheDir = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $cacheDir));
        $files = array();
        $content = '';
        foreach (self::getOrderedClasses($classes) as $class) {
@@ -153,7 +153,7 @@ REGEX;
            $c = file_get_contents($file);

            if (preg_match($dontInlineRegex, $c)) {
-                $file = explode(DIRECTORY_SEPARATOR, $file);
+                $file = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $file));

                for ($i = 0; isset($file[$i], $cacheDir[$i]); ++$i) {
                    if ($file[$i] !== $cacheDir[$i]) {
@@ -161,11 +161,11 @@ REGEX;
                    }
                }
                if (1 >= $i) {
-                    $file = var_export(implode(DIRECTORY_SEPARATOR, $file), true);
+                    $file = var_export(implode('/', $file), true);
                } else {
                    $file = array_slice($file, $i);
-                    $file = str_repeat('..'.DIRECTORY_SEPARATOR, count($cacheDir) - $i).implode(DIRECTORY_SEPARATOR, $file);
-                    $file = '__DIR__.'.var_export(DIRECTORY_SEPARATOR.$file, true);
+                    $file = str_repeat('../', count($cacheDir) - $i).implode('/', $file);
+                    $file = '__DIR__.'.var_export('/'.$file, true);
                }

                $c = "\nnamespace {require $file;}";
@@ -299,7 +299,13 @@ REGEX;
     */
    private static function writeCacheFile($file, $content)
    {
-        $tmpFile = tempnam(dirname($file), basename($file));
+        $dir = dirname($file);
+        if (!is_writable($dir)) {
+            throw new \RuntimeException(sprintf('Cache directory "%s" is not writable.', $dir));
+        }
+
+        $tmpFile = tempnam($dir, basename($file));
+
        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
            @chmod($file, 0666 & ~umask());

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
Author	SHA1	Message	Date
Nicolas Grekas	0152f7a47a	Merge branch '3.1' into 3.2 * 3.1: Fix merge [DI] Dont share service when no id provided Fix Container and PhpDumper test inaccuracies [DI] Fix missing new line after private alias [ClassLoader] Throw an exception if the cache is not writeable Fixing regression in TwigEngine exception handling.	2017-01-10 15:14:38 +01:00
Nicolas Grekas	1c67601ae9	Merge branch '2.8' into 3.1 * 2.8: Fix merge [DI] Dont share service when no id provided Fix Container and PhpDumper test inaccuracies [DI] Fix missing new line after private alias [ClassLoader] Throw an exception if the cache is not writeable Fixing regression in TwigEngine exception handling.	2017-01-10 15:09:41 +01:00
Nicolas Grekas	7c46951128	Merge branch '2.7' into 2.8 * 2.7: [DI] Dont share service when no id provided Fix Container and PhpDumper test inaccuracies [DI] Fix missing new line after private alias [ClassLoader] Throw an exception if the cache is not writeable Fixing regression in TwigEngine exception handling.	2017-01-10 15:03:07 +01:00
Grégoire Pineau	1108382429	[ClassLoader] Throw an exception if the cache is not writeable	2017-01-09 15:44:50 +01:00
Fabien Potencier	f0ecf2161f	Merge branch '3.1' into 3.2 * 3.1: updated LICENSE year updated LICENSE year Fixed `@return self` with `$this`	2017-01-02 12:32:22 -08:00
Fabien Potencier	96b69c7817	Merge branch '2.8' into 3.1 * 2.8: updated LICENSE year updated LICENSE year Fixed `@return self` with `$this`	2017-01-02 12:31:54 -08:00
Fabien Potencier	4332e482b5	Merge branch '2.7' into 2.8 * 2.7: updated LICENSE year Fixed `@return self` with `$this`	2017-01-02 12:30:24 -08:00
Fabien Potencier	2e19afbcc7	updated LICENSE year	2017-01-02 12:30:00 -08:00
Fabien Potencier	87cd4e6943	Merge branch '2.8' into 3.2 * 2.8: [ClassLoader] Use only forward slashes in generated class map ensure the proper context for nested validations bug #20653 [WebProfilerBundle] Profiler includes ghost panels	2016-11-29 09:26:13 +01:00
Fabien Potencier	d31a6b4c5c	Merge branch '2.8' into 3.1 * 2.8: [ClassLoader] Use only forward slashes in generated class map ensure the proper context for nested validations bug #20653 [WebProfilerBundle] Profiler includes ghost panels	2016-11-29 09:26:03 +01:00
Fabien Potencier	f7fe9d14e1	Merge branch '2.7' into 2.8 * 2.7: [ClassLoader] Use only forward slashes in generated class map ensure the proper context for nested validations bug #20653 [WebProfilerBundle] Profiler includes ghost panels	2016-11-29 09:25:54 +01:00
Nicolas Grekas	65ac4dbf59	[ClassLoader] Use only forward slashes in generated class map	2016-11-29 09:16:08 +01:00