Merge pull request #2171 from Log1x/10.0.0-dev

Sage 10 Cleanup
roots · May 1, 2019 · a3fa3e0 · a3fa3e0
2 parents 603bfdd + 0e4df1e
commit a3fa3e0
Show file tree

Hide file tree

Showing 32 changed files with 402 additions and 153 deletions.
diff --git a/README.md b/README.md
@@ -49,11 +49,16 @@ During theme installation you will have options to update `style.css` theme head
 ```shell
 themes/your-theme-name/   # → Root of your Sage based theme
 ├── app/                  # → Theme PHP
-│   ├── Controllers/      # → Controller files
+│   ├── Composers/        # → Composer files
 │   ├── admin.php         # → Theme customizer setup
 │   ├── filters.php       # → Theme filters
 │   ├── helpers.php       # → Helper functions
 │   └── setup.php         # → Theme setup
+├── config/               # → Config files
+│   ├── app.php           # → Application configuration
+│   ├── assets.php        # → Asset configuration
+│   ├── filesystems.php   # → Filesystems configuration
+│   └── view.php          # → View configuration
 ├── composer.json         # → Autoloading for `app/` files
 ├── composer.lock         # → Composer lock file (never edit)
 ├── dist/                 # → Built theme assets (never edit)
@@ -97,7 +102,6 @@ Edit `app/setup.php` to enable or disable theme features, setup navigation menus
 ## Documentation
 
 * [Sage documentation](https://roots.io/sage/docs/)
-* [Controller documentation](https://github.com/soberwp/controller#usage)
 
 ## Contributing
 
@@ -107,7 +111,7 @@ Contributions are welcome from everyone. We have [contributing guidelines](https
 
 Help support our open-source development efforts by [becoming a patron](https://www.patreon.com/rootsdev).
 
-<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://cdn.roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a>
+<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://cdn.roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a> <a href="https://www.itineris.co.uk/"><img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="itineris" width="200" height="150"></a>
 
 ## Community
 

diff --git a/app/Composers/Title.php b/app/Composers/Title.php
@@ -6,37 +6,61 @@
 
 class Title extends Composer
 {
+    /**
+     * List of views served by this composer.
+     *
+     * @var array
+     */
     protected static $views = [
         'partials.page-header',
         'partials.content',
         'partials.content-*'
     ];
 
+    /**
+     * Data to be passed to view before rendering.
+     *
+     * @param  array $data
+     * @param  \Illuminate\View\View $view
+     * @return array
+     */
     public function with($data, $view)
     {
         return ['title' => $this->title($view->getName())];
     }
 
+    /**
+     * Returns the post title.
+     *
+     * @param  \Illuminate\View\View $view
+     * @return string
+     */
     public function title($view)
     {
         if ($view !== 'partials.page-header') {
             return get_the_title();
         }
+
         if (is_home()) {
             if ($home = get_option('page_for_posts', true)) {
                 return get_the_title($home);
             }
+
             return __('Latest Posts', 'sage');
         }
+
         if (is_archive()) {
             return get_the_archive_title();
         }
+
         if (is_search()) {
             return sprintf(__('Search Results for %s', 'sage'), get_search_query());
         }
+
         if (is_404()) {
             return __('Not Found', 'sage');
         }
+
         return get_the_title();
     }
 }
diff --git a/app/helpers.php b/app/helpers.php
@@ -1,5 +1,3 @@
 <?php
 
 namespace App;
-
-
diff --git a/app/setup.php b/app/setup.php
@@ -90,10 +90,12 @@
         'before_title' => '<h3>',
         'after_title' => '</h3>'
     ];
+
     register_sidebar([
         'name' => __('Primary', 'sage'),
         'id' => 'sidebar-primary'
     ] + $config);
+
     register_sidebar([
         'name' => __('Footer', 'sage'),
         'id' => 'sidebar-footer'

diff --git a/composer.json b/composer.json
@@ -33,21 +33,21 @@
       "App\\": "app/"
     }
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/qwp6t/acorn"
-    }
-  ],
-  "minimum-stability": "dev",
   "require": {
-    "php": ">=7.1",
+    "php": "^7.1.3",
     "roots/acorn": "dev-master"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.3",
-    "roots/sage-installer": "~1.3"
+    "roots/sage-installer": "^1.6",
+    "squizlabs/php_codesniffer": "^3.3"
+  },
+  "config": {
+    "optimize-autoloader": true,
+    "preferred-install": "dist",
+    "sort-packages": true
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "scripts": {
     "test": [
       "phpcs"