Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit fd19629
Merge: d454c87 4e2ecf3
Author: MGatner <mgatner@icloud.com>
Date:   Tue Jun 15 09:41:16 2021 -0400

    Merge pull request codeigniter4#4834 from totoprayogo1916/fix-folder-doc

    rename `application` to `app`

commit 4e2ecf3
Author: Toto Prayogo <totoprayogo1916@gmail.com>
Date:   Tue Jun 15 11:30:43 2021 +0700

    rename `application` to `app`

commit d454c87
Merge: 3b54e81 9c0446d
Author: MGatner <mgatner@icloud.com>
Date:   Tue Jun 15 07:41:21 2021 -0400

    Merge pull request codeigniter4#4828 from Vizzielli/patch-3

commit 3b54e81
Merge: 3d0a4a7 f33d880
Author: MGatner <mgatner@icloud.com>
Date:   Sun Jun 13 16:09:04 2021 -0400

    Merge pull request codeigniter4#4727 from MGatner/publisher

    Publisher Class

commit 9c0446d
Author: Gianluigi Vizzielli <22755275+Vizzielli@users.noreply.github.com>
Date:   Sat Jun 12 13:25:40 2021 +0200

    Graphic fix on some screen res

    Before: https://prnt.sc/1559re2
    After: https://prnt.sc/1559uou

commit f33d880
Author: MGatner <mgatner@icloud.com>
Date:   Tue Jun 8 16:22:12 2021 +0000

    Add Publisher restrictions

commit fb70807
Author: MGatner <mgatner@icloud.com>
Date:   Tue Jun 1 17:23:22 2021 +0000

    Tweak formatting

commit 45d776e
Author: MGatner <mgatner@icloud.com>
Date:   Tue Jun 1 14:44:25 2021 +0000

    Implement review changes

commit 5906310
Author: MGatner <mgatner@icloud.com>
Date:   Sat May 29 20:17:28 2021 +0000

    Fix UG format

commit c974add
Author: MGatner <mgatner@icloud.com>
Date:   Sat May 29 15:43:14 2021 +0000

    Fix test bleeding

commit ad41218
Author: MGatner <mgatner@icloud.com>
Date:   Sat May 29 15:18:50 2021 +0000

    Add Publish command

commit 3987bff
Author: MGatner <mgatner@icloud.com>
Date:   Thu May 27 20:15:37 2021 +0000

    Add Guide, tweak class

commit 865c73a
Author: MGatner <mgatner@icloud.com>
Date:   Tue May 25 16:13:09 2021 +0000

    Apply additional suggestions

commit 116fc82
Author: MGatner <mgatner@icloud.com>
Date:   Mon May 24 15:51:16 2021 -0400

    Apply suggestions from code review

    Co-authored-by: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>

commit 18ae7ea
Author: MGatner <mgatner@icloud.com>
Date:   Mon May 24 01:10:02 2021 +0000

    Add tests

commit cd66294
Author: MGatner <mgatner@icloud.com>
Date:   Sun May 23 19:09:49 2021 +0000

    Add Publisher

commit f13dc33
Author: MGatner <mgatner@icloud.com>
Date:   Sun May 23 19:00:08 2021 +0000

    Remove pasted imports
Merge branch 'master' of https://github.com/codeigniter4/CodeIgniter4 into develop
  • Loading branch information
@sclubricants
sclubricants committed Jun 7, 2022
2 parents 348a57e + 394a6c6 commit 74dbef7
Show file tree
Hide file tree
Showing 2,624 changed files with 67,116 additions and 43,458 deletions.
18 changes: 10 additions & 8 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
; top-most EditorConfig file
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://editorconfig.org

root = true

; Unix-style newlines
[*]
end_of_line = lf

[*.php]
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
indent_size = 4
indent_style = space
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{yml,yaml}]
indent_size = 2
8 changes: 7 additions & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,24 @@ contributing/ export-ignore
.editorconfig export-ignore
.nojekyll export-ignore export-ignore
CODE_OF_CONDUCT.md export-ignore
DCO.txt export-ignore
CONTRIBUTING.md export-ignore
PULL_REQUEST_TEMPLATE.md export-ignore
stale.yml export-ignore
Vagrantfile.dist export-ignore

# They don't want our test files
tests/AutoReview/ export-ignore
tests/system/ export-ignore
utils/ export-ignore
depfile.yaml export-ignore
rector.php export-ignore
phpunit.xml.dist export-ignore
phpstan-baseline.neon.dist export-ignore
phpstan.neon.dist export-ignore
phpstan-bootstrap.php export-ignore
.php-cs-fixer.dist.php export-ignore
.php-cs-fixer.no-header.php export-ignore
.php-cs-fixer.user-guide.php export-ignore

# The source user guide, either
user_guide_src/ export-ignore
Expand Down
39 changes: 0 additions & 39 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file

This file was deleted.

124 changes: 124 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
name: Bug report
description: Create a report to help us improve CodeIgniter
title: "Bug: "
labels: ['bug']

body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
Before you begin, **please ensure that there are no existing issues,
whether still open or closed, related to your report**.
If there is, your report will be closed promptly.
For example, if you get the error "*Undefined property: Config\\Exceptions::$sensitiveDataInTrace*",
you can search the GitHub repository with the keyword "[$sensitiveDataInTrace](https://github.com/codeigniter4/CodeIgniter4/search?q=%24sensitiveDataInTrace&type=issues)".
---
- type: dropdown
id: php-version
attributes:
label: PHP Version
description: Which PHP versions did you run your code?
multiple: true
options:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
validations:
required: true

- type: input
id: codeigniter-version
attributes:
label: CodeIgniter4 Version
description: |
e.g. 4.1.5
If you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases), please
check to see if the problem occurs with the latest version.
validations:
required: true

- type: dropdown
id: codeigniter-installation
attributes:
label: CodeIgniter4 Installation Method
multiple: false
options:
- Composer (using `codeigniter4/appstarter`)
- Composer (as dependency to an existing project)
- Manual (zip or tar.gz)
- Git
validations:
required: true

- type: dropdown
id: operating-systems
attributes:
label: Which operating systems have you tested for this bug?
description: You may select more than one.
multiple: true
options:
- macOS
- Windows
- Linux
validations:
required: true

- type: dropdown
id: server
attributes:
label: Which server did you use?
options:
- apache
- cli
- cli-server (PHP built-in webserver)
- cgi-fcgi
- fpm-fcgi
- phpdbg
validations:
required: true

- type: input
id: database
attributes:
label: Database
description: e.g. MySQL 5.6, MariaDB 10.2, PostgreSQL 9.6
validations:
required: false

- type: textarea
id: description
attributes:
label: What happened?
placeholder: Tell us what you see!
validations:
required: true

- type: textarea
attributes:
label: Steps to Reproduce
description: Steps to reproduce the behavior.
validations:
required: true

- type: textarea
attributes:
label: Expected Output
description: What do you expect to happen instead of this filed bug?
validations:
required: true

- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
blank_issues_enabled: false
contact_links:
- name: CodeIgniter Forum
url: https://forum.codeigniter.com/forum-30.html
about: Please ask your support questions in the forums. Thanks!

- name: CodeIgniter Slack channel
url: https://codeigniterchat.slack.com
about: Engage with other members of the community in our Slack channel.
11 changes: 0 additions & 11 deletions .github/ISSUE_TEMPLATE/support-question.md
View file

This file was deleted.

7 changes: 4 additions & 3 deletions PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ Explain what you have changed, and why.

**Checklist:**
- [ ] Securely signed commits
- [ ] Component(s) with PHPdocs
- [ ] Component(s) with PHPDoc blocks, only if necessary or adds value
- [ ] Unit testing, with >80% coverage
- [ ] User guide updated
- [ ] Conforms to style guide

---------Remove from here down in your description----------
<!--
**Notes**
- Pull requests must be in English
Expand All @@ -19,4 +19,5 @@ Explain what you have changed, and why.
- Unsolicited pull requests will be considered, but there is no guarantee of acceptance
- Pull requests should be from a feature branch in the contributor's fork of the repository
to the develop branch of the project repository

-->
25 changes: 15 additions & 10 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
version: 2

updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
- package-ecosystem: 'composer'
directory: '/'
schedule:
interval: 'daily'
open-pull-requests-limit: 10

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'daily'
ignore:
- dependency-name: '*'
update-types:
- 'version-update:semver-minor'
- 'version-update:semver-patch'
23 changes: 23 additions & 0 deletions .github/release.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
changelog:
exclude:
authors:
- dependabot
categories:
- title: Breaking Changes
labels:
- 'breaking change'
- title: Fixed Bugs
labels:
- bug
- title: New Features
labels:
- 'new feature'
- title: Enhancements
labels:
- enhancement
- title: Refactoring
labels:
- refactor
- title: Others (Only for checking. Remove this category)
labels:
- "*"
2 changes: 2 additions & 0 deletions .github/scripts/deploy-framework
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ done

# Copy repo-specific files
cp -Rf ${SOURCE}/admin/framework/. ./
# Copy tests files
cp -Rf ${SOURCE}/admin/starter/tests/. ./tests/

# Commit the changes
git add .
Expand Down
36 changes: 36 additions & 0 deletions .github/scripts/deploy-userguide
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/bash

## Deploy codeigniter4/userguide

# Setup variables
SOURCE=$1
TARGET=$2
RELEASE=$3
VERSION=`echo "$RELEASE" | cut -c 2-`

echo "Preparing for version $3"
echo "Merging files from $1 to $2"

# Prepare the source
cd $SOURCE
git checkout master
cd user_guide_src
make html
make epub

# Prepare the target
cd $TARGET
git checkout master
rm -rf docs

# Copy files
cp -Rf ${SOURCE}/user_guide_src/build/html ./docs
cp -Rf ${SOURCE}/user_guide_src/build/epub/CodeIgniter.epub ./CodeIgniter${VERSION}.epub

# Ensure underscore prefixed files are published
touch ${TARGET}/docs/.nojekyll

# Commit the changes
git add .
git commit -m "Release ${RELEASE}"
git push
Loading

0 comments on commit 74dbef7

Please sign in to comment.