Merge pull request #1865 from enricog84/v2.4.x

l3pp4rd · web-flow · commit d5fdc573b6a2 · 2018-01-08T16:13:45.000+02:00
Changed default for hardDelete option to 'true'
diff --git a/lib/Gedmo/SoftDeleteable/Mapping/Driver/Annotation.php b/lib/Gedmo/SoftDeleteable/Mapping/Driver/Annotation.php
@@ -45,7 +45,7 @@ public function readExtendedMetadata($meta, array &$config)
                 $config['timeAware'] = $annot->timeAware;
             }
 
-            $config['hardDelete'] = false;
+            $config['hardDelete'] = true;
             if (isset($annot->hardDelete)) {
                 if (!is_bool($annot->hardDelete)) {
                     throw new InvalidMappingException("hardDelete must be boolean. ".gettype($annot->hardDelete)." provided.");
diff --git a/lib/Gedmo/SoftDeleteable/Mapping/Driver/Xml.php b/lib/Gedmo/SoftDeleteable/Mapping/Driver/Xml.php
@@ -49,7 +49,7 @@ public function readExtendedMetadata($meta, array &$config)
                     $config['timeAware'] = $this->_getBooleanAttribute($xml->{'soft-deleteable'}, 'time-aware');
                 }
 
-                $config['hardDelete'] = false;
+                $config['hardDelete'] = true;
                 if ($this->_isAttributeSet($xml->{'soft-deleteable'}, 'hard-delete')) {
                     $config['hardDelete'] = $this->_getBooleanAttribute($xml->{'soft-deleteable'}, 'hard-delete');
                 }
diff --git a/lib/Gedmo/SoftDeleteable/Mapping/Driver/Yaml.php b/lib/Gedmo/SoftDeleteable/Mapping/Driver/Yaml.php
@@ -55,7 +55,7 @@ public function readExtendedMetadata($meta, array &$config)
                     $config['timeAware'] = $classMapping['soft_deleteable']['time_aware'];
                 }
 
-                $config['hardDelete'] = false;
+                $config['hardDelete'] = true;
                 if (isset($classMapping['soft_deleteable']['hard_delete'])) {
                     if (!is_bool($classMapping['soft_deleteable']['hard_delete'])) {
                         throw new InvalidMappingException("hardDelete must be boolean. ".gettype($classMapping['soft_deleteable']['hard_delete'])." provided.");

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function readExtendedMetadata($meta, array &$config)`
`45`	`45`	`$config['timeAware'] = $annot->timeAware;`
`46`	`46`	`}`
`47`	`47`
`48`		`- $config['hardDelete'] = false;`
	`48`	`+ $config['hardDelete'] = true;`
`49`	`49`	`if (isset($annot->hardDelete)) {`
`50`	`50`	`if (!is_bool($annot->hardDelete)) {`
`51`	`51`	`throw new InvalidMappingException("hardDelete must be boolean. ".gettype($annot->hardDelete)." provided.");`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function readExtendedMetadata($meta, array &$config)`
`49`	`49`	`$config['timeAware'] = $this->_getBooleanAttribute($xml->{'soft-deleteable'}, 'time-aware');`
`50`	`50`	`}`
`51`	`51`
`52`		`- $config['hardDelete'] = false;`
	`52`	`+ $config['hardDelete'] = true;`
`53`	`53`	`if ($this->_isAttributeSet($xml->{'soft-deleteable'}, 'hard-delete')) {`
`54`	`54`	`$config['hardDelete'] = $this->_getBooleanAttribute($xml->{'soft-deleteable'}, 'hard-delete');`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function readExtendedMetadata($meta, array &$config)`
`55`	`55`	`$config['timeAware'] = $classMapping['soft_deleteable']['time_aware'];`
`56`	`56`	`}`
`57`	`57`
`58`		`- $config['hardDelete'] = false;`
	`58`	`+ $config['hardDelete'] = true;`
`59`	`59`	`if (isset($classMapping['soft_deleteable']['hard_delete'])) {`
`60`	`60`	`if (!is_bool($classMapping['soft_deleteable']['hard_delete'])) {`
`61`	`61`	`throw new InvalidMappingException("hardDelete must be boolean. ".gettype($classMapping['soft_deleteable']['hard_delete'])." provided.");`