Merge pull request #3 from ARCANEDEV/feature-laravel_53

Adding Laravel 5.3 Support
ARCANEDEV · Sep 1, 2016 · ca2198d · ca2198d
2 parents 6087409 + b88037d
commit ca2198d
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 53 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
+/_docs            export-ignore
 /tests            export-ignore
 /.editorconfig    export-ignore
 /.gitattributes   export-ignore

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
-.idea/
-_arcanedev/
-build/
-vendor/
-composer.phar
-composer.lock
+/build/
+/vendor/
+/composer.phar
+/composer.lock
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -20,8 +20,8 @@ checks:
 
 tools:
     external_code_coverage:
-        timeout: 600
-        runs: 8
+        timeout: 1200
+        runs: 9
     php_code_sniffer:
         enabled: true
         config:

diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ language: php
 sudo: false
 
 php:
-  - 5.5.9
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - nightly
   - hhvm
 
@@ -17,6 +16,7 @@ matrix:
 env:
   - TESTBENCH_VERSION=3.1.*
   - TESTBENCH_VERSION=3.2.*
+  - TESTBENCH_VERSION=3.3.*
 
 before_script:
   - travis_retry composer self-update

diff --git a/README.md b/README.md
@@ -15,6 +15,14 @@
 
 This package is inspired/based on [RoumenDamianoff/laravel-sitemap](https://github.com/RoumenDamianoff/laravel-sitemap).
 
+### Features
+
+  * Easy setup &amp; configuration.
+  * Well documented &amp; IDE Friendly.
+  * Well tested with maximum code quality.
+  * Laravel `5.1 | 5.2 | 5.3` are supported.
+  * Made with :heart: &amp; :coffee:.
+
 ## Table of contents
 
 1. [Requirements](_docs/1.Requirements.md)
@@ -25,12 +33,7 @@ This package is inspired/based on [RoumenDamianoff/laravel-sitemap](https://gith
 ## TODOS
 
   - [ ] Documentation.
-  - [ ] 100% Code coverage + Maximum code quality.
-  - [ ] Laravel 5.3 support.
-  - [x] Laravel 5.2 support.
-  - [x] Laravel 5.1 support.
-  - [ ] Laravel 5.0 support.
-  - [x] Well documented package (IDE Friendly).
+  - [ ] 100% Code coverage.
 
 ## Contribution
 
@@ -46,7 +49,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 - [RoumenDamianoff/laravel-sitemap](https://github.com/RoumenDamianoff/laravel-sitemap)
 - [All Contributors][link-contributors]
 
-[badge_laravel]:      https://img.shields.io/badge/For-Laravel%205.x-orange.svg?style=flat-square
+[badge_laravel]:      https://img.shields.io/badge/Laravel-%205.1|5.2|5.3-orange.svg?style=flat-square
 [badge_license]:      https://img.shields.io/packagist/l/arcanedev/laravel-sitemap.svg?style=flat-square
 [badge_build]:        https://img.shields.io/travis/ARCANEDEV/LaravelSitemap.svg?style=flat-square
 [badge_hhvm]:         https://img.shields.io/hhvm/arcanedev/laravel-sitemap.svg?style=flat-square

diff --git a/config/sitemap.php b/config/sitemap.php
@@ -1,21 +1,37 @@
 <?php
 
 return [
-    'cache' => [
+    /* ------------------------------------------------------------------------------------------------
+     |  Cache
+     | ------------------------------------------------------------------------------------------------
+     */
+    'cache'          => [
         'enabled'  => false,
 
         'key'      => 'laravel-sitemap.your-key',
 
         'lifetime' => 3600,
     ],
 
-    'escaping'        => true,
-
-    'use-limit-size'  => false,
-
-    'max-size'        => null,
-
-    'styles' => [
+    /* ------------------------------------------------------------------------------------------------
+     |  Escaping
+     | ------------------------------------------------------------------------------------------------
+     */
+    'escaping'       => true,
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Limit Size
+     | ------------------------------------------------------------------------------------------------
+     */
+    'use-limit-size' => false,
+
+    'max-size'       => null,
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Styles
+     | ------------------------------------------------------------------------------------------------
+     */
+    'styles'         => [
         'enabled'  => true,
 
         'location' => null,

diff --git a/resources/views/google-news.blade.php b/resources/views/google-news.blade.php
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 @if ($style)
-<?xml-stylesheet href="{{ $style }}" type="text/xsl"?>
+    <?php echo '<?xml-stylesheet href="'.$style.'" type="text/xsl"?>'; ?>
 @endif
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-        xmlns:news="http://www.google.com/schemas/sitemap-news/0.9"
-        xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
     @foreach ($items as $item)
-    <?php $googlenews = $item->getGooglenews() ?>
     <url>
         <loc>{{ $item->getLoc() }}</loc>
         @if ($item->getLastmod())
@@ -17,6 +14,7 @@
             <xhtml:link rel="alternate" media="{{ $alternate['media'] }}" href="{{ $alternate['url'] }}" />
             @endforeach
         @endif
+        <?php $googlenews = $item->getGooglenews() ?>
         <news:news>
             <news:publication>
                 <news:name>{{ $googlenews['sitename'] }}</news:name>

diff --git a/resources/views/ror-rdf.blade.php b/resources/views/ror-rdf.blade.php
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 <rdf:RDF xmlns="http://rorweb.com/0.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
     <Resource rdf:about="sitemap">
         <title>{{ $channel['title'] }}</title>
         <url>{{ $channel['link'] }}</url>
         <type>sitemap</type>
     </Resource>
     @foreach ($items as $item)
-        <Resource>
-            <url>{{ $item->getLoc() }}</url>
-            <title>{{ $item->getTitle() }}</title>
-            <updated>{{ $item->getLastmod() }}</updated>
-            <updatePeriod>{{ $item->getFreq() }}</updatePeriod>
-            <sortOrder>{{ $item->getPriority() }}</sortOrder>
-            <resourceOf rdf:resource="sitemap"/>
-        </Resource>
+    <Resource>
+        <url>{{ $item->getLoc() }}</url>
+        <title>{{ $item->getTitle() }}</title>
+        <updated>{{ $item->getLastmod() }}</updated>
+        <updatePeriod>{{ $item->getFreq() }}</updatePeriod>
+        <sortOrder>{{ $item->getPriority() }}</sortOrder>
+        <resourceOf rdf:resource="sitemap"/>
+    </Resource>
     @endforeach
 </rdf:RDF>
diff --git a/resources/views/ror-rss.blade.php b/resources/views/ror-rss.blade.php
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 <rss version="2.0" xmlns:ror="http://rorweb.com/0.1/" >
     <channel>
         <title>{{ $channel['title'] }}</title>

diff --git a/resources/views/sitemapindex.blade.php b/resources/views/sitemapindex.blade.php
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 @if ($style)
-<?xml-stylesheet href="{{ $style }}" type="text/xsl"?>
+    <?php echo '<?xml-stylesheet href="'.$style.'" type="text/xsl"?>'; ?>
 @endif
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     @foreach($sitemaps as $sitemap)

diff --git a/resources/views/xml-mobile.blade.php b/resources/views/xml-mobile.blade.php
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 @if ($style)
-<?xml-stylesheet href="{{ $style }}" type="text/xsl"?>
+    <?php echo '<?xml-stylesheet href="'.$style.'" type="text/xsl"?>'; ?>
 @endif
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0">
-@foreach($items as $item)
-  <url>
-    <loc>{{ $item->getLoc() }}</loc>
-    <mobile:mobile/>
-  </url>
-@endforeach
+    @foreach($items as $item)
+    <url>
+        <loc>{{ $item->getLoc() }}</loc>
+        <mobile:mobile/>
+    </url>
+    @endforeach
 </urlset>
diff --git a/resources/views/xml.blade.php b/resources/views/xml.blade.php
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 @if ($style)
-<?xml-stylesheet href="{{ $style }}" type="text/xsl"?>
+    <?php echo '<?xml-stylesheet href="'.$style.'" type="text/xsl"?>'; ?>
 @endif
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
     @foreach ($items as $item)