Skip to content

Commit

Permalink
Merge pull request #424 from codeigniter4projects/develop
Browse files Browse the repository at this point in the history 
Deploy
  • Loading branch information
@kenjis
kenjis authored Feb 17, 2024
2 parents b2d1f12 + e009184 commit a51db5c
Show file tree
Hide file tree
Showing 9 changed files with 89 additions and 58 deletions.
6 changes: 4 additions & 2 deletions app/Controllers/Contribute.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Controllers;

use Github\Exception\ExceptionInterface;
use Psr\Http\Client\ClientExceptionInterface;

class Contribute extends BaseController
{
Expand All @@ -16,7 +16,9 @@ public function index()
// Contributors are already sorted, so grab the first 12
$data['contributors'][$id] = array_slice($contributors, 0, 12);
}
} catch (ExceptionInterface $e) {
} catch (ClientExceptionInterface $e) {
log_message('error', '[' . __METHOD__ . '] ' . get_class($e) . ': ' . $e->getMessage());

$data['contributors'] = null;
}

Expand Down
6 changes: 4 additions & 2 deletions app/Controllers/Download.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Controllers;

use Github\Exception\ExceptionInterface;
use Psr\Http\Client\ClientExceptionInterface;

class Download extends BaseController
{
Expand All @@ -18,7 +18,9 @@ public function index()
'v3link' => end($releases['framework3'])->download_url,
'v4link' => end($releases['framework4'])->download_url,
];
} catch (ExceptionInterface $e) {
} catch (ClientExceptionInterface $e) {
log_message('error', '[' . __METHOD__ . '] ' . get_class($e) . ': ' . $e->getMessage());

$data = [
'v3name' => '<em>unknown</em>',
'v4name' => '<em>unknown</em>',
Expand Down
6 changes: 4 additions & 2 deletions app/Controllers/Home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Controllers;

use Github\Exception\ExceptionInterface;
use Psr\Http\Client\ClientExceptionInterface;

class Home extends BaseController
{
Expand All @@ -17,7 +17,9 @@ public function index()
'stargazers_count' => number_format($repos['codeigniter4']->stargazers_count),
'forks_count' => number_format($repos['codeigniter4']->forks_count),
];
} catch (ExceptionInterface $e) {
} catch (ClientExceptionInterface $e) {
log_message('error', '[' . __METHOD__ . '] ' . get_class($e) . ': ' . $e->getMessage());

$data = [
'html_url' => 'https://github.com/codeigniter4/CodeIgniter4',
'stargazers_count' => '',
Expand Down
32 changes: 11 additions & 21 deletions app/Views/contribute.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div id="content-inner">
<div id="contribute-heart-holder">
<img src="/assets/icons/heart.png" id="contribute-heart" alt="heart icon"/>
<p>Contribute to CodeIgniter</p>
<p class="inner-page-text-box-title">Contribute to CodeIgniter</p>
</div><!--heart ends here-->

<div class="clr"></div>
Expand All @@ -20,12 +20,6 @@
on the <a href="https://github.com/codeigniter4/CodeIgniter4" target="_blank" class="link-primary">CodeIgniter4 repository</a> on GitHub.
</p>

<div class="inner-page-text-box">
<p>
The CodeIgniter 4 roadmap is explained on <a href="https://forum.codeigniter.com/forum-28.html" target="_blank" class="link-primary">our forum</a>.
</p>
</div>

<p>
Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check
a few things first:
Expand All @@ -35,7 +29,7 @@
<li>There is not already an open Issue</li>
<li>The issue has already been fixed (check the develop branch, or look for closed Issues)</li>
<li>Is it something really obvious that you fix it yourself?</li>
<li>If you are unsure if you have found a bug, then start a new thread in the CodeIgniter forum, in the <a href="https://forum.codeigniter.com/forum-30.html" target="_blank" class="link-primary">Issues section</a>!</li>
<li>If you are unsure if you have found a bug, then start a new thread in the CodeIgniter forum, in the <a href="https://forum.codeigniter.com/forum-19.html" target="_blank" class="link-primary">Issues section</a>!</li>
</ul>
</p>
<p>
Expand All @@ -47,9 +41,8 @@
<div class="clr"></div>

<div class="inner-page-text-box">
<div class="inner-page-text-box-title">CodeIgniter 3</div>
<p>
CodeIgniter 3 has its own <a href="https://github.com/bcit-ci/CodeIgniter" target="_blank" class="link-primary">Github repository</a>.
CodeIgniter 3 has its own <a href="https://github.com/bcit-ci/CodeIgniter" target="_blank" class="link-primary">GitHub repository</a>.
</p>
</div><!--contribute boxes ende-->

Expand All @@ -58,7 +51,7 @@
<div class="warning">
<p>
Security issues should be reported with an email to our security team, rather than being brought up on the forum or
raised as a Github issue, thanks! Read more about responsible disclosure.
raised as a GitHub issue, thanks! Read more about responsible disclosure.
</p>
</div><!--warning ende-->

Expand All @@ -72,12 +65,9 @@
<div class="inner-page-text-sub-box-title">Testers</div>
<p>
We always need feedback on what works and what does not! Most of the development effort is going into Version 4,
so that is where the need is greatest. If you find something that is definitely a bug, and you are a Github user,
please create a new "issue". If you are not a Github user, or if you are unsure if you have found a bug, then start
a new thread in the CodeIgniter forum <a href="https://forum.codeigniter.com/forum-30.html" target="_blank" class="link-primary">Issues section</a>!
</p>
<p>
CodeIgniter 3 has its own <a href="https://forum.codeigniter.com/forum-19.html" target="_blank" class="link-primary boldy600">support subforum</a>.
so that is where the need is greatest. If you find something that is definitely a bug, and you are a GitHub user,
please create a new "issue". If you are not a GitHub user, or if you are unsure if you have found a bug, then start
a new thread in the CodeIgniter forum <a href="https://forum.codeigniter.com/forum-19.html" target="_blank" class="link-primary">Issues section</a>!
</p>
</div><!--inner-page-text-sub-box ende-->

Expand All @@ -86,7 +76,7 @@
<div class="inner-page-text-sub-box">
<div class="inner-page-text-sub-box-title">Writers</div>
<p>
Every project needs good documentation! The CodeIgniter user guide is part of the <a href="https://github.com/codeigniter4/CodeIgniter4" target="_blank" class="link-primary">Github project</a> (mentioned above),
Every project needs good documentation! The CodeIgniter user guide is part of the <a href="https://github.com/codeigniter4/CodeIgniter4" target="_blank" class="link-primary">GitHub project</a> (mentioned above),
and there is always room for more tutorials.
</p>
<p>
Expand Down Expand Up @@ -120,7 +110,7 @@
<div class="inner-page-text-sub-box-title">Designers</div>
<p>
Suggestions and help with our website, User Guide, and forum design are always welcome! We are working on themes
for each of these, which will be shared in their own Github repository.
for each of these, which will be shared in their own GitHub repository.
</p>
</div><!--inner-page-text-sub-box ende-->

Expand All @@ -135,14 +125,14 @@
<div class="inner-page-text-sub-box">
<div class="inner-page-text-sub-box-title">Coders</div>
<p>
If you would like to get involved in helping to build CodeIgniter4, join us on <a href="https://github.com/codeigniter4/" target="_blank" class="link-primary">Github</a>!
If you would like to get involved in helping to build CodeIgniter4, join us on <a href="https://github.com/codeigniter4/" target="_blank" class="link-primary">GitHub</a>!
A detailed contribution guide is in
<a href="https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/README.md" target="_blank">Contributing to CodeIgniter</a>,
that it is properly documented, and that you use the
<a href="https://nvie.com/posts/a-successful-git-branching-model/" target="_blank" class="link-primary">Git-Flow branching model</a>.
</p>
<p>
CodeIgniter 3 equivalent link: its <a href="https://github.com/bcit-ci/CodeIgniter/" target="_blank" class="link-primary boldy600">repository</a>.
CodeIgniter 3 equivalent link: its <a href="https://github.com/bcit-ci/CodeIgniter/" target="_blank" class="link-primary">repository</a>.
</p>
</div><!--inner-page-text-sub-box ende-->

Expand Down
12 changes: 6 additions & 6 deletions app/Views/discuss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="warning">
<p>
Security issues should be reported with an email to our <a href="mailto:[email protected]" class="link-reverse">security team</a>, rather than being brought up on the forum or
raised as a Github issue, thanks!
raised as a GitHub issue, thanks!
</p>
</div><!--warning ends here-->

Expand Down Expand Up @@ -65,16 +65,16 @@ class="link-primary" target="_blank">signup</a> for it :)
<div class="clr"></div>

<div class="inner-page-text-box">
<div class="inner-page-text-box-title">Github</div>
<div class="inner-page-text-box-title">GitHub</div>
<p>
The development action takes place on Github. See the contribute page for more details.
The development action takes place on GitHub. See the contribute page for more details.
</p>
<p class="boldy600">
The Github repository is where you can file bug reports (github issues), or where you can submit pull requests
for enhancements to or fixes for framework. Github is *not* for support or help ... use the forum instead.
The GitHub repository is where you can file bug reports (github issues), or where you can submit pull requests
for enhancements to or fixes for framework. GitHub is *not* for support or help ... use the forum instead.
</p>
<p>
Github issues are also used for tracking planned and approved enhancements, often tied in to specific releases.
GitHub issues are also used for tracking planned and approved enhancements, often tied in to specific releases.
</p>
<p>
<a href="https://github.com/bcit-ci/CodeIgniter/" class="buttons" target="_blank">CodeIgniter 3</a>
Expand Down
2 changes: 1 addition & 1 deletion app/Views/home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<div class="important-link-boxes">
<span class="boldy600 dark">Fix Bugs or Add Features</span>
<br />
On Github
On GitHub
<br /><br />
<svg height="32" viewBox="0 0 32 32" width="32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="M16.003 0C7.17 0 .008 7.162.008 15.997c0 7.067 4.582 13.063 10.94 15.179.8.146 1.052-.328 1.052-.752 0-.38.008-1.442 0-2.777-4.449.967-5.371-2.107-5.371-2.107-.727-1.848-1.775-2.34-1.775-2.34-1.452-.992.109-.973.109-.973 1.605.113 2.451 1.649 2.451 1.649 1.427 2.443 3.743 1.737 4.654 1.329.146-1.034.56-1.739 1.017-2.139-3.552-.404-7.286-1.776-7.286-7.906 0-1.747.623-3.174 1.646-4.292-.165-.404-.715-2.031.157-4.234 0 0 1.343-.43 4.398 1.641a15.31 15.31 0 0 1 4.005-.538c1.359.006 2.727.183 4.005.538 3.055-2.07 4.396-1.641 4.396-1.641.872 2.203.323 3.83.159 4.234 1.023 1.118 1.644 2.545 1.644 4.292 0 6.146-3.74 7.498-7.304 7.893C19.479 23.548 20 24.508 20 26v4.428c0 .428.258.901 1.07.746C27.422 29.055 32 23.062 32 15.997 32 7.162 24.838 0 16.003 0z" fill="" fill-rule="evenodd"/></svg>
</div> <!--important-link-boxes ends here-->
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"http-interop/http-factory-guzzle": "^1.0",
"knplabs/github-api": "^3.0",
"league/commonmark": "^2.3",
"psr/container": "^1.1"
"psr/container": "^2.0"
},
"require-dev": {
"codeigniter4/devkit": "^1.0",
Expand Down
51 changes: 28 additions & 23 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a51db5c

Please sign in to comment.