[TASK] ext:install Protect some methods in FolderStructure

[Packages/TYPO3.CMS.git] / typo3 / sysext / install / Classes / FolderStructure / AbstractNode.php

diff --git a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
index 48dbaa9..d50920e 100644 (file)
--- a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
@@ -65,7 +65,7 @@ abstract class AbstractNode {
         *
         * @return string Permission, eg. 2770
         */
         *
         * @return string Permission, eg. 2770
         */

-       public function getTargetPermission() {
+       protected function getTargetPermission() {

                return $this->targetPermission;
        }
 
                return $this->targetPermission;
        }
 


@@ -74,7 +74,7 @@ abstract class AbstractNode {
         *
         * @return array
         */
         *
         * @return array
         */

-       public function getChildren() {
+       protected function getChildren() {

                return $this->children;
        }
 
                return $this->children;
        }
 


@@ -83,7 +83,7 @@ abstract class AbstractNode {
         *
         * @return NULL|NodeInterface
         */
         *
         * @return NULL|NodeInterface
         */

-       public function getParent() {
+       protected function getParent() {

                return $this->parent;
        }
 
                return $this->parent;
        }
 


@@ -93,7 +93,7 @@ abstract class AbstractNode {
         * @return string
         */
        public function getAbsolutePath() {
         * @return string
         */
        public function getAbsolutePath() {

-               return $this->parent->getAbsolutePath() . '/' . $this->name;
+               return $this->getParent()->getAbsolutePath() . '/' . $this->name;

        }
 
        /**
        }
 
        /**


@@ -102,7 +102,7 @@ abstract class AbstractNode {
         * @return boolean TRUE if parent is writable
         */
        public function isWritable() {
         * @return boolean TRUE if parent is writable
         */
        public function isWritable() {

-               return $this->parent->isWritable();
+               return $this->getParent()->isWritable();

        }
 
        /**
        }
 
        /**


@@ -113,10 +113,10 @@ abstract class AbstractNode {
         * @return boolean
         */
        protected function exists() {
         * @return boolean
         */
        protected function exists() {

-               if (is_link($this->getAbsolutePath())) {
+               if (@is_link($this->getAbsolutePath())) {

                        return TRUE;
                } else {
                        return TRUE;
                } else {

-                       return file_exists($this->getAbsolutePath());
+                       return @file_exists($this->getAbsolutePath());

                }
        }
 
                }
        }
 


@@ -133,7 +133,7 @@ abstract class AbstractNode {
                                1366744035
                        );
                }
                                1366744035
                        );
                }

-               $result = @chmod($this->getAbsolutePath(), octdec($this->targetPermission));
+               $result = @chmod($this->getAbsolutePath(), octdec($this->getTargetPermission()));

                if ($result === TRUE) {
                        $status = new Status\OkStatus();
                        $status->setTitle('Fixed permission on ' . $this->getRelativePathBelowSiteRoot() . '.');
                if ($result === TRUE) {
                        $status = new Status\OkStatus();
                        $status->setTitle('Fixed permission on ' . $this->getRelativePathBelowSiteRoot() . '.');


@@ -157,7 +157,7 @@ abstract class AbstractNode {
                if ($this->isWindowsOs()) {
                        return TRUE;
                }
                if ($this->isWindowsOs()) {
                        return TRUE;
                }

-               if ($this->getCurrentPermission() === $this->targetPermission) {
+               if ($this->getCurrentPermission() === $this->getTargetPermission()) {

                        return TRUE;
                } else {
                        return FALSE;
                        return TRUE;
                } else {
                        return FALSE;