use protected instead of private to make overriding services easier

k3ssen · Apr 5, 2021 · e1a1cca · e1a1cca
1 parent e1fd7d4
commit e1a1cca
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 26 deletions.
diff --git a/Command/SymfonyVuetifiedSetupCommand.php b/Command/SymfonyVuetifiedSetupCommand.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace K3ssen\SymfonyVuetified\Command;
 
@@ -13,10 +14,11 @@ class SymfonyVuetifiedSetupCommand extends Command
 {
     protected static $defaultName = 'symfony-vuetified:setup';
     protected static $defaultDescription = 'Adds/modifies required files/settings for setup SymfonyVuetified';
+
     /**
      * @var string
      */
-    private $rootDir;
+    protected $rootDir;
 
     public function __construct(string $rootDir)
     {
@@ -26,9 +28,7 @@ public function __construct(string $rootDir)
 
     protected function configure()
     {
-        $this
-            ->setDescription(self::$defaultDescription)
-        ;
+        $this->setDescription(self::$defaultDescription);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int

diff --git a/Maker/Generator.php b/Maker/Generator.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace K3ssen\SymfonyVuetified\Maker;
 
@@ -18,7 +19,8 @@ public function __construct(BaseGenerator $generator)
         );
     }
 
-    private function getProp(BaseGenerator $generator, string $propertyName) {
+    protected function getProp(BaseGenerator $generator, string $propertyName)
+    {
         $reflectionProperty = new \ReflectionProperty($generator, $propertyName);
         $reflectionProperty->setAccessible(true);
         return $reflectionProperty->getValue($generator);

diff --git a/Resources/assets/components/Form/SvCollection.vue b/Resources/assets/components/Form/SvCollection.vue
@@ -58,7 +58,6 @@ import {Component, Mixins, Prop} from 'vue-property-decorator';
         collectionErrorMessage!: string;
         @Prop({type: String, default: 'There are no items in this collection.'})
         noItemsText!: string;
-
         @Prop({type: Boolean, default: false})
         verticalTabs!: boolean;
 
@@ -86,7 +85,7 @@ import {Component, Mixins, Prop} from 'vue-property-decorator';
             (this.form.children as IForm[]).splice(key, 1);
         }
 
-        public hasError(form: any) {
+        hasError(form: any) {
             if (form.vars.errors) {
                 return true;
             }

diff --git a/Resources/assets/components/Form/SvForm.vue b/Resources/assets/components/Form/SvForm.vue
@@ -57,11 +57,11 @@
             return null;
         }
 
-        public mounted() {
+        mounted() {
             this.setRemainingErrors(this.form);
         }
 
-        public setRemainingErrors(form: any) {
+        setRemainingErrors(form: any) {
             if (!form.rendered && form.vars.errors) {
                 this.remainingErrors.push({
                     label: form !== this.form ? form.vars?.label || form.vars.name : null,

diff --git a/Resources/assets/components/SvApp.vue b/Resources/assets/components/SvApp.vue
@@ -27,8 +27,8 @@
     @Component
     export default class SvApp extends Vue {
         @Prop({default: 'Application'})
-        public title!: string;
+        title!: string;
 
-        private drawer: boolean = true;
+        drawer: boolean = true;
     };
 </script>
diff --git a/Resources/assets/components/SvFetch.vue b/Resources/assets/components/SvFetch.vue
@@ -12,15 +12,15 @@ import {Vue, Prop, Component, Watch} from 'vue-property-decorator';
 @Component
 export default class SvFetch extends Vue {
     @Prop()
-    public url!: string;
+    url!: string;
     @Prop({default: 'vue', type: String})
-    public vueObjectName!: any;
+    vueObjectName!: any;
     @Prop({default: 'vueData', type: String})
-    public dataObjectName!: any;
+    dataObjectName!: any;
     @Prop({default: 'vueStoreData', type: String})
-    public storeDataObjectName!: any;
+    storeDataObjectName!: any;
 
-    private component: any = null;
+    component: any = null;
 
     async mounted() {
         await this.load();

diff --git a/Resources/assets/components/SvMenuItem.vue b/Resources/assets/components/SvMenuItem.vue
@@ -18,9 +18,9 @@
     @Component
     export default class SvMenuItem extends Vue {
         @Prop({default: null})
-        public href!: string;
+        href!: string;
 
         @Prop({default: ''})
-        public icon!: string;
+        icon!: string;
     }
 </script>
diff --git a/Resources/assets/tsconfig.json b/Resources/assets/tsconfig.json
@@ -11,8 +11,5 @@
         "allowSyntheticDefaultImports": true,
         "sourceMap": true,
         "types": ["vuetify"]
-    },
-    "exclude": [
-        "node_modules"
-    ]
+    }
 }
diff --git a/Vue/VueExtension.php b/Vue/VueExtension.php
@@ -13,7 +13,7 @@ class VueExtension extends AbstractExtension
     /**
      * @var VueDataStorage
      */
-    private $vueDataStorage;
+    protected $vueDataStorage;
 
     public function __construct(VueDataStorage $vueDataStorage)
     {

diff --git a/Vue/VueForm.php b/Vue/VueForm.php
@@ -25,10 +25,10 @@ class VueForm implements \JsonSerializable
     /**
      * @var array
      */
-    private $vars;
+    protected $vars;
 
     /** @var VueForm[] */
-    private $children = [];
+    protected $children = [];
 
     public static function create(FormInterface $form): self
     {
@@ -63,7 +63,7 @@ public function jsonSerialize()
         ];
     }
 
-    private function addMappedBlockPrefixes()
+    protected function addMappedBlockPrefixes()
     {
         $initialPrefixes = $this->vars['block_prefixes'];
         foreach ($initialPrefixes as $index => $block_prefix) {