jackyban · jackyban · Sep 3, 2020 · Mar 28, 2019 · Apr 1, 2019 · Apr 1, 2019
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,57 +2,62 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (5.0.0.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     blankslate (2.1.2.4)
-    classifier-reborn (2.0.4)
+    classifier-reborn (2.2.0)
       fast-stemmer (~> 1.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     colorator (0.1)
-    concurrent-ruby (1.0.2)
-    ethon (0.9.1)
+    concurrent-ruby (1.1.5)
+    ethon (0.12.0)
       ffi (>= 1.3.0)
     execjs (2.7.0)
-    faraday (0.10.0)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
-    ffi (1.9.14)
-    ffi (1.9.14-x64-mingw32)
+    ffi (1.10.0)
+    ffi (1.10.0-x64-mingw32)
     gemoji (2.1.0)
-    github-pages (39)
+    github-pages (43)
       RedCloth (= 4.2.9)
-      github-pages-health-check (~> 0.2)
+      github-pages-health-check (= 0.6.0)
       jekyll (= 2.4.0)
       jekyll-coffeescript (= 1.0.1)
       jekyll-feed (= 0.3.1)
+      jekyll-gist (= 1.4.0)
       jekyll-mentions (= 0.2.1)
-      jekyll-redirect-from (= 0.8.0)
+      jekyll-paginate (= 1.1.0)
+      jekyll-redirect-from (= 0.9.1)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-sitemap (= 0.8.1)
+      jekyll-seo-tag (= 0.1.4)
+      jekyll-sitemap (= 0.9.0)
       jemoji (= 0.5.0)
-      kramdown (= 1.5.0)
+      kramdown (= 1.9.0)
       liquid (= 2.6.2)
       maruku (= 0.7.0)
       mercenary (~> 0.3)
       pygments.rb (= 0.6.3)
-      rdiscount (= 2.1.7)
-      redcarpet (= 3.3.2)
+      rdiscount (= 2.1.8)
+      redcarpet (= 3.3.3)
       terminal-table (~> 1.4)
-    github-pages-health-check (0.3.2)
-      net-dns (~> 0.6)
+    github-pages-health-check (0.6.0)
+      addressable (~> 2.3)
+      net-dns (~> 0.8)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (1.9.0)
+    html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    i18n (0.7.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
     jekyll (2.4.0)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
@@ -77,63 +82,71 @@ GEM
       html-pipeline (~> 1.9.0)
       jekyll (~> 2.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.8.0)
+    jekyll-redirect-from (0.9.1)
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.8.1)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
+    jekyll-seo-tag (0.1.4)
+      jekyll (>= 2.0)
+    jekyll-sitemap (0.9.0)
+    jekyll-watch (1.5.1)
+      listen (~> 3.0)
     jemoji (0.5.0)
       gemoji (~> 2.0)
       html-pipeline (~> 1.9)
       jekyll (>= 2.0)
-    kramdown (1.5.0)
+    kramdown (1.9.0)
     liquid (2.6.2)
-    listen (3.0.8)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     maruku (0.7.0)
     mercenary (0.3.6)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
     multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    nokogiri (1.6.8.1-x64-mingw32)
-      mini_portile2 (~> 2.1.0)
-    octokit (4.6.1)
+    net-dns (0.9.0)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.2-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.12)
+    posix-spawn (0.3.13)
     public_suffix (1.5.3)
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rdiscount (2.1.7)
-    redcarpet (3.3.2)
-    rouge (2.0.7)
-    safe_yaml (1.0.4)
-    sass (3.4.22)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rdiscount (2.1.8)
+    redcarpet (3.3.3)
+    rouge (3.3.0)
+    ruby_dep (1.5.0)
+    safe_yaml (1.0.5)
+    sass (3.7.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thread_safe (0.3.5)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
     toml (0.1.2)
       parslet (~> 1.5.0)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
-    yajl-ruby (1.2.1)
+    unicode-display_width (1.5.0)
+    yajl-ruby (1.2.3)
 
 PLATFORMS
   ruby
@@ -144,4 +157,4 @@ DEPENDENCIES
   rouge
 
 BUNDLED WITH
-   1.13.6
+   1.17.2
diff --git a/README.md b/README.md
@@ -1,8 +1,11 @@
 # PHP 之道
 
-[在线地址](https://laravel-china.github.io/php-the-right-way/)
+[Github 在线地址](https://leo-yi.github.io/php-the-right-way/)
+[国内在线地址](https://show.oyifan.com/php-the-right-way/)
 
-> 此项目由 [Laravel China 社区](https://laravel-china.org/ ) 维护，请维护互联网开放精神，转载请保留出处。
+> 此项目由 [Leo Yi](https://blog.oyifan.com/ ) 个人维护，请维护互联网开放精神，转载请保留出处。
+
+> 此项目 fork [Laravel China 社区](https://laravel-china.org/ ) 维护的仓库，因为此仓库2年不更新，提PR也没反应，才决定自己建立这个站，感谢 summer 做出的贡献。
 
 ## 概览
 

diff --git a/_includes/welcome.md b/_includes/welcome.md
@@ -42,12 +42,5 @@ _PHP: The Right Way_ 被翻译为以下版本：
 
 帮助我们让本网站作为 PHP 新手的最佳资源！[在 GitHub 上贡献][2]
 
-## 推广 {#spread-the-word}
-
-_PHP: 您可以在网站上放置 PHP之道 的横幅来支持我们，让 PHP 的新人知道哪里可以获取到好的资料！
-
-[广告横幅][3]
-
 [1]: https://leanpub.com/phptherightway
-[2]: https://github.com/summerblue/php-the-right-way/tree/gh-pages
-[3]: /banners.html
+[2]: https://github.com/codeguy/php-the-right-way/tree/gh-pages
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -24,13 +24,8 @@
     <body>
         <header class="site-header">
             <h1><a href="/">PHP <em>The Right Way</em></a></h1>
-            <div class="build-date">最后更新于: {{ site.time }} 由 <a href="https://laravel-china.org/" target="_blank" >Laravel China 社区</a> 维护</div>
-            <div class="share">
-                <a class="btn-share" href="http://service.weibo.com/share/share.php?url=https://laravel-china.github.io/php-the-right-way&title=PHP+The+Right+Way+PHP+之道" target="_blank">分享到微博</a>
-                <br>
-                 <a class="btn-share" href="https://laravel-china.org/" target="_blank" style="margin-top: 13px;">❤ Laravel China 社区 ❤</a> 
-            </div>
-            <a class="fork-me" href="https://github.com/laravel-china/php-the-right-way" target="_blank"></a>
+            <div class="build-date">最后更新于: {{ site.time }} 由 <a href="https://blog.oyifan.com/" target="_blank" >Leo Yi</a>个人维护</div>
+            <a class="fork-me" href="https://github.com/leo-yi/php-the-right-way" target="_blank"></a>
         </header>
 
         <nav class="site-navigation">
@@ -74,34 +69,28 @@ <h1><a href="/">PHP <em>The Right Way</em></a></h1>
 
         <footer class="site-footer" id="credits">
             <h2>中文版本</h2>  
+            <ul>
+                <li><a href="https://github.com/leo-yi/php-the-right-way/" target="_blank">Leo Yi</a></li>
+                <li><a href="https://github.com/laravel-china/php-the-right-way/graphs/contributors" target="_blank">项目贡献者</a></li>
+            </ul>
+            <h2>感谢之前的维护者</h2>
             <ul>
                 <li><a href="https://github.com/summerblue" target="_blank">Summer</a></li>
                 <li><a href="https://laravel-china.org/" target="_blank">Laravel China 社区</a></li>
-                <li><a href="https://github.com/laravel-china/php-the-right-way/graphs/contributors" target="_blank">项目贡献者</a></li>
             </ul>
             <h2>原始版本创建和维护</h2>
             <ul>
-                <li><a href="http://joshlockhart.com" target="_blank">Josh Lockhart</a></li>
-                <li><a href="http://philsturgeon.co.uk/" target="_blank">Phil Sturgeon</a></li>
-                <li><a href="https://github.com/laravel-china/php-the-right-way/graphs/contributors" target="_blank">Project Contributors</a></li>
+                    <li><a href="https://joshlockhart.com" target="_blank">Josh Lockhart</a></li>
+                    <li><a href="https://philsturgeon.uk/" target="_blank">Phil Sturgeon</a></li>
+                    <li><a href="https://github.com/codeguy/php-the-right-way/graphs/contributors" target="_blank">Project Contributors</a></li>
             </ul>
             <div class="license">
-                <a class="cc-badge" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"></a>
+                <a class="cc-badge" rel="license" href="https://creativecommons.org/licenses/by-nc-sa/3.0/"></a>
                 <br />
-                <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://joshlockhart.com" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a>
+                <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="https://joshlockhart.com" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a>
                 <br/>
-                is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
+                is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
             </div>
         </footer>
-        <script>
-        var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', 'UA-70965318-6']);
-        _gaq.push(['_trackPageview']);
-        (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
-            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-        })();
-        </script>
     </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -22,51 +22,40 @@
         </style>
     </head>
     <body>
-        <header class="site-header">
-            <h1><a href="/">PHP <em>The Right Way</em></a></h1>
-            <div class="build-date">最后更新于: {{ site.time }} 由 <a href="https://laravel-china.org/" target="_blank" >Laravel China 社区</a> 维护</div>
-            <div class="share">
-                <a class="btn-share" href="http://service.weibo.com/share/share.php?url=https://laravel-china.github.io/php-the-right-way&title=PHP+The+Right+Way+PHP+之道" target="_blank">分享到微博</a>
-                <br>
-                 <a class="btn-share" href="https://laravel-china.org/" target="_blank" style="margin-top: 13px;">❤ Laravel China 社区 ❤</a> 
-            </div>
-            <a class="fork-me" href="https://github.com/codeguy/php-the-right-way" target="_blank"></a>
-        </header>
+            <header class="site-header">
+                    <h1><a href="/">PHP <em>The Right Way</em></a></h1>
+                    <div class="build-date">最后更新于: {{ site.time }} 由 <a href="https://blog.oyifan.com/" target="_blank" >Leo Yi</a>个人维护</div>
+                    <a class="fork-me" href="https://github.com/leo-yi/php-the-right-way" target="_blank"></a>
+            </header>
 
         <div class="site-content">
             {{ content }}
         </div>
 
         <footer class="site-footer" id="credits">
-             <h2>中文版本</h2>  
-            <ul>
-                <li><a href="https://github.com/summerblue" target="_blank">Summer</a></li>
-                <li><a href="https://laravel-china.org/" target="_blank">Laravel China 社区</a></li>
-                <li><a href="https://github.com/laravel-china/php-the-right-way/graphs/contributors" target="_blank">项目贡献者</a></li>
-            </ul>
-            <h2>原始版本创建和维护</h2>
-            <ul>
-                <li><a href="http://joshlockhart.com" target="_blank">Josh Lockhart</a></li>
-                <li><a href="http://philsturgeon.co.uk/" target="_blank">Phil Sturgeon</a></li>
-                <li><a href="https://github.com/codeguy/php-the-right-way/graphs/contributors" target="_blank">Project Contributors</a></li>
-            </ul>
-            <div class="license">
-                <a class="cc-badge" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"></a>
-                <br />
-                <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://joshlockhart.com" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a>
-                <br/>
-                is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
-            </div>
+                <h2>中文版本</h2>  
+                <ul>
+                    <li><a href="https://github.com/leo-yi/php-the-right-way/" target="_blank">Leo Yi</a></li>
+                    <li><a href="https://github.com/laravel-china/php-the-right-way/graphs/contributors" target="_blank">项目贡献者</a></li>
+                </ul>
+                <h2>感谢之前的维护者</h2>
+                <ul>
+                    <li><a href="https://github.com/summerblue" target="_blank">Summer</a></li>
+                    <li><a href="https://laravel-china.org/" target="_blank">Laravel China 社区</a></li>
+                </ul>
+                <h2>原始版本创建和维护</h2>
+                <ul>
+                        <li><a href="https://joshlockhart.com" target="_blank">Josh Lockhart</a></li>
+                        <li><a href="https://philsturgeon.uk/" target="_blank">Phil Sturgeon</a></li>
+                        <li><a href="https://github.com/codeguy/php-the-right-way/graphs/contributors" target="_blank">Project Contributors</a></li>
+                </ul>
+                <div class="license">
+                    <a class="cc-badge" rel="license" href="https://creativecommons.org/licenses/by-nc-sa/3.0/"></a>
+                    <br />
+                    <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="https://joshlockhart.com" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a>
+                    <br/>
+                    is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
+                </div>
         </footer>
-        <script>
-        var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', 'UA-70965318-6']);
-        _gaq.push(['_trackPageview']);
-        (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
-            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-        })();
-        </script>
     </body>
 </html>
diff --git a/_posts/01-02-01-Use-the-Current-Stable-Version.md b/_posts/01-02-01-Use-the-Current-Stable-Version.md
@@ -1,12 +1,12 @@
 ---
-title:   使用当前稳定版本 (7.1)
+title:   使用当前稳定版本 (7.2)
 isChild: true
 anchor:  use_the_current_stable_version
 ---
 
-## 使用当前稳定版本 (7.1) {#use_the_current_stable_version_title}
+## 使用当前稳定版本 (7.2) {#use_the_current_stable_version_title}
 
-如果你刚开始学习 PHP，请使用最新的稳定版本 [PHP 7.1][php-release]。PHP 7.1 非常新，相较于 5.x 版本增加了强大的 [新特性](#language_highlights)。PHP 引擎大部分被重写，PHP 的运行速度已经远远超越过去。
+如果你刚开始学习 PHP，请使用最新的稳定版本 [PHP 7.2][php-release]。PHP 7.x 非常新，相较于 5.x 版本增加了强大的 [新特性](#language_highlights)。PHP 引擎大部分被重写，PHP 的运行速度已经远远超越过去。
 
 在很长的一段时间内，你会发现 5.x 还在广泛的被使用，目前最新的 5.x 版本是 5.6。对于当下，这并不是一个坏选项。然而，你应该尽快升级 - PHP 5.6 [将会在 2018 停止安全更新](http://php.net/supported-versions.php)。7.1 做了 [向下兼容][php71-bc] 处理，所以你的升级应该不会很难。. 如果你想查找一个函数及其用法，可以去官方手册 [php.net][php-docs] 中查找。