diff --git a/lib/Doctrine/ORM/Cache/Region/FileLockRegion.php b/lib/Doctrine/ORM/Cache/Region/FileLockRegion.php index 69167bc90..d8d4b2694 100644 --- a/lib/Doctrine/ORM/Cache/Region/FileLockRegion.php +++ b/lib/Doctrine/ORM/Cache/Region/FileLockRegion.php @@ -61,7 +61,7 @@ class FileLockRegion implements ConcurrentRegion */ public function __construct(Region $region, $directory, $lockLifetime) { - if ( ! is_dir($directory) && ! @mkdir($directory, 0777, true)) { + if ( ! is_dir($directory) && ! @mkdir($directory, 0775, true)) { throw new \InvalidArgumentException(sprintf('The directory "%s" does not exist and could not be created.', $directory)); } @@ -242,6 +242,7 @@ class FileLockRegion implements ConcurrentRegion if ( ! @file_put_contents($filename, $lock->value, LOCK_EX)) { return null; } + chmod($filename, 0664); return $lock; } diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php index 1f97a5074..b229f4a6c 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php @@ -137,7 +137,7 @@ EOT // Process destination directory if ( ! is_dir($destPath = $input->getArgument('dest-path'))) { - mkdir($destPath, 0777, true); + mkdir($destPath, 0775, true); } $destPath = realpath($destPath); diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php index 522118794..21edb9dab 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php @@ -79,7 +79,7 @@ EOT } if ( ! is_dir($destPath)) { - mkdir($destPath, 0777, true); + mkdir($destPath, 0775, true); } $destPath = realpath($destPath); diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index ec83c4e49..9027d9aa5 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -364,7 +364,7 @@ public function __construct() $dir = dirname($path); if ( ! is_dir($dir)) { - mkdir($dir, 0777, true); + mkdir($dir, 0775, true); } $this->isNew = !file_exists($path) || (file_exists($path) && $this->regenerateEntityIfExists); @@ -389,6 +389,7 @@ public function __construct() } elseif ( ! $this->isNew && $this->updateEntityIfExists) { file_put_contents($path, $this->generateUpdatedEntityClass($metadata, $path)); } + chmod($path, 0664); } /** diff --git a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php index f94292afc..f431588fb 100644 --- a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php @@ -147,11 +147,12 @@ class extends $dir = dirname($path); if ( ! is_dir($dir)) { - mkdir($dir, 0777, true); + mkdir($dir, 0775, true); } if ( ! file_exists($path)) { file_put_contents($path, $code); + chmod($path, 0664); } } diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php index 3e96af821..b2ed435bc 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php @@ -130,7 +130,7 @@ abstract class AbstractExporter public function export() { if ( ! is_dir($this->_outputDir)) { - mkdir($this->_outputDir, 0777, true); + mkdir($this->_outputDir, 0775, true); } foreach ($this->_metadata as $metadata) { @@ -139,12 +139,13 @@ abstract class AbstractExporter $path = $this->_generateOutputPath($metadata); $dir = dirname($path); if ( ! is_dir($dir)) { - mkdir($dir, 0777, true); + mkdir($dir, 0775, true); } if (file_exists($path) && !$this->_overwriteExistingFiles) { throw ExportException::attemptOverwriteExistingFile($path); } file_put_contents($path, $output); + chmod($path, 0664); } } }