Skip to content

Commit

Permalink
Pickles Framework v2.1.12
Browse files Browse the repository at this point in the history
- 初期化時に `session.cookie_secure = 1` をセットするようになった。
- サイトマップCSVの読み込み時に、UTF-8 を明示するようになった。
- `$px->h()` を追加した。
- その他、内部コードの細かい修正。
  • Loading branch information
tomk79 committed Dec 28, 2022
1 parent ff9c5de commit 32ce018
Show file tree
Hide file tree
Showing 54 changed files with 283 additions and 210 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $ chmod -R 777 ./caches

## 更新履歴 - Change log

### Pickles Framework v2.1.12 (リリース日未定)
### Pickles Framework v2.1.12 (2022年12月28日)

- 初期化時に `session.cookie_secure = 1` をセットするようになった。
- サイトマップCSVの読み込み時に、UTF-8 を明示するようになった。
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@php ./vendor/phpunit/phpunit/phpunit"
] ,
"documentation": [
"@php ./phpDocumentor.phar --title \"Pickles Framework v2.1.11 API Document\" -d \"./php/\",\"./px-files/themes/\" -t \"./sample_pages/phpdoc/\""
"@php ./phpDocumentor.phar --title \"Pickles Framework v2.1.12 API Document\" -d \"./php/\",\"./px-files/themes/\" -t \"./sample_pages/phpdoc/\""
]
} ,
"minimum-stability": "dev",
Expand Down
2 changes: 1 addition & 1 deletion php/px.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function get_version(){
// 同一のバージョンとして扱うことができる。
// 便宜上、 v2.1系 の番号で代表して示す。

return '2.1.11';
return '2.1.12';
}

/**
Expand Down
18 changes: 9 additions & 9 deletions sample_pages/phpdoc/classes/picklesFramework2-bowl.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down Expand Up @@ -326,7 +326,7 @@ <h4 class="phpdocumentor-element__name" id="method_each">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">175</span>
<span class="phpdocumentor-element-found-in__line">195</span>

</aside>

Expand Down Expand Up @@ -373,7 +373,7 @@ <h4 class="phpdocumentor-element__name" id="method_get">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">137</span>
<span class="phpdocumentor-element-found-in__line">151</span>

</aside>

Expand Down Expand Up @@ -422,7 +422,7 @@ <h4 class="phpdocumentor-element__name" id="method_get_clean">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">118</span>
<span class="phpdocumentor-element-found-in__line">126</span>

</aside>

Expand Down Expand Up @@ -471,7 +471,7 @@ <h4 class="phpdocumentor-element__name" id="method_get_keys">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">164</span>
<span class="phpdocumentor-element-found-in__line">184</span>

</aside>

Expand Down Expand Up @@ -506,7 +506,7 @@ <h4 class="phpdocumentor-element__name" id="method_pull">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">155</span>
<span class="phpdocumentor-element-found-in__line">175</span>

</aside>

Expand Down Expand Up @@ -623,7 +623,7 @@ <h4 class="phpdocumentor-element__name" id="method_replace">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">103</span>
<span class="phpdocumentor-element-found-in__line">107</span>

</aside>

Expand Down Expand Up @@ -684,7 +684,7 @@ <h4 class="phpdocumentor-element__name" id="method_send">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/bowl.php"><a href="files/php-bowl.html"><abbr title="php/bowl.php">bowl.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">86</span>
<span class="phpdocumentor-element-found-in__line">90</span>

</aside>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
22 changes: 11 additions & 11 deletions sample_pages/phpdoc/classes/picklesFramework2-commands-publish.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down Expand Up @@ -1056,7 +1056,7 @@ <h4 class="phpdocumentor-element__name" id="method_add_queue">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1016</span>
<span class="phpdocumentor-element-found-in__line">1018</span>

</aside>

Expand Down Expand Up @@ -1381,7 +1381,7 @@ <h4 class="phpdocumentor-element__name" id="method_get_path_publish_dir">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1172</span>
<span class="phpdocumentor-element-found-in__line">1174</span>

</aside>

Expand Down Expand Up @@ -1414,7 +1414,7 @@ <h4 class="phpdocumentor-element__name" id="method_get_region_root_path">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1150</span>
<span class="phpdocumentor-element-found-in__line">1152</span>

</aside>

Expand Down Expand Up @@ -1449,7 +1449,7 @@ <h4 class="phpdocumentor-element__name" id="method_is_ignore_path">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1059</span>
<span class="phpdocumentor-element-found-in__line">1061</span>

</aside>

Expand Down Expand Up @@ -1496,7 +1496,7 @@ <h4 class="phpdocumentor-element__name" id="method_is_locked">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1235</span>
<span class="phpdocumentor-element-found-in__line">1237</span>

</aside>

Expand Down Expand Up @@ -1531,7 +1531,7 @@ <h4 class="phpdocumentor-element__name" id="method_is_region_path">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1115</span>
<span class="phpdocumentor-element-found-in__line">1117</span>

</aside>

Expand Down Expand Up @@ -1578,7 +1578,7 @@ <h4 class="phpdocumentor-element__name" id="method_lock">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1191</span>
<span class="phpdocumentor-element-found-in__line">1193</span>

</aside>

Expand Down Expand Up @@ -1950,7 +1950,7 @@ <h4 class="phpdocumentor-element__name" id="method_touch_lockfile">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1271</span>
<span class="phpdocumentor-element-found-in__line">1273</span>

</aside>

Expand Down Expand Up @@ -1985,7 +1985,7 @@ <h4 class="phpdocumentor-element__name" id="method_unlock">
<aside class="phpdocumentor-element-found-in">
<abbr class="phpdocumentor-element-found-in__file" title="php/commands/publish.php"><a href="files/php-commands-publish.html"><abbr title="php/commands/publish.php">publish.php</abbr></a></abbr>
:
<span class="phpdocumentor-element-found-in__line">1257</span>
<span class="phpdocumentor-element-found-in__line">1259</span>

</aside>

Expand Down
4 changes: 2 additions & 2 deletions sample_pages/phpdoc/classes/picklesFramework2-pickles.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pickles Framework v2.1.11 API Document</title>
<title>Pickles Framework v2.1.12 API Document</title>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="../">
Expand All @@ -24,7 +24,7 @@
</head>
<body id="top">
<header class="phpdocumentor-header phpdocumentor-section">
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.11 API Document</a></h1>
<h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Pickles Framework v2.1.12 API Document</a></h1>
<input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
<label class="phpdocumentor-header__menu-icon" for="menu-button">
<i class="fas fa-bars"></i>
Expand Down
Loading

0 comments on commit 32ce018

Please sign in to comment.