Merge pull request symfony#558 from tristanbes/master

weaverryan · weaverryan · commit a97bf67a4892 · 2011-07-26T20:02:06.000-07:00
Changed the name of the method to be more revelent. Fix the leading slash on the getWebLocation() for portability
diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
@@ -49,15 +49,26 @@ First, create a simple Doctrine Entity class to work with::
          */
         public $path;
 
-        public function getFullPath()
+        public function getAbsolutePath()
         {
             return null === $this->path ? null : $this->getUploadRootDir().'/'.$this->path;
         }
 
+        public function getWebPath()
+        {
+            return null === $this->path ? null : $this->getUploadDir().'/'.$this->path;
+        }
+
         protected function getUploadRootDir()
         {
             // the absolute directory path where uploaded documents should be saved
-            return __DIR__.'/../../../../web/uploads/documents';
+            return __DIR__.'/../../../../web/'.$this->getUploadDir();
+        }
+
+        protected function getUploadDir()
+        {
+            // get rid of the __DIR__ so it doesn't screw when displaying uploaded doc/image in the view.
+            return 'uploads/documents';
         }
     }
 
@@ -275,7 +286,7 @@ Next, refactor the ``Document`` class to take advantage of these callbacks::
          */
         public function removeUpload()
         {
-            if ($file = $this->getFullPath()) {
+            if ($file = $this->getAbsolutePath()) {
                 unlink($file);
             }
         }
@@ -332,7 +343,7 @@ property, instead of the actual filename::
          */
         public function removeUpload()
         {
-            if ($file = $this->getFullPath()) {
+            if ($file = $this->getAbsolutePath()) {
                 unlink($file);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,26 @@ First, create a simple Doctrine Entity class to work with::`
`49`	`49`	`*/`
`50`	`50`	`public $path;`
`51`	`51`
`52`		`- public function getFullPath()`
	`52`	`+ public function getAbsolutePath()`
`53`	`53`	`{`
`54`	`54`	`return null === $this->path ? null : $this->getUploadRootDir().'/'.$this->path;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ public function getWebPath()`
	`58`	`+ {`
	`59`	`+ return null === $this->path ? null : $this->getUploadDir().'/'.$this->path;`
	`60`	`+ }`
	`61`	`+`
`57`	`62`	`protected function getUploadRootDir()`
`58`	`63`	`{`
`59`	`64`	`// the absolute directory path where uploaded documents should be saved`
`60`		`- return __DIR__.'/../../../../web/uploads/documents';`
	`65`	`+ return __DIR__.'/../../../../web/'.$this->getUploadDir();`
	`66`	`+ }`
	`67`	`+`
	`68`	`+ protected function getUploadDir()`
	`69`	`+ {`
	`70`	`+ // get rid of the __DIR__ so it doesn't screw when displaying uploaded doc/image in the view.`
	`71`	`+ return 'uploads/documents';`
`61`	`72`	`}`
`62`	`73`	`}`
`63`	`74`
@@ -275,7 +286,7 @@ Next, refactor the ``Document`` class to take advantage of these callbacks::
`275`	`286`	`*/`
`276`	`287`	`public function removeUpload()`
`277`	`288`	`{`
`278`		`- if ($file = $this->getFullPath()) {`
	`289`	`+ if ($file = $this->getAbsolutePath()) {`
`279`	`290`	`unlink($file);`
`280`	`291`	`}`
`281`	`292`	`}`
`@@ -332,7 +343,7 @@ property, instead of the actual filename::`
`332`	`343`	`*/`
`333`	`344`	`public function removeUpload()`
`334`	`345`	`{`
`335`		`- if ($file = $this->getFullPath()) {`
	`346`	`+ if ($file = $this->getAbsolutePath()) {`
`336`	`347`	`unlink($file);`
`337`	`348`	`}`
`338`	`349`	`}`